diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-24 10:40:41 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-24 10:40:41 -0400 |
| commit | 66a2f4c64b8cf9949503f992ce8571244e213bab (patch) | |
| tree | 70a9d266f26b8cac38755267eb6bb3798a43e262 | |
| parent | 51d8b5d568027c89006073aa98f2afae7e871873 (diff) | |
| parent | 88269b288a2b62543cf867d92b6e7cc41d44b922 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
| -rw-r--r-- | lib/jabber.php | 2 | ||||
| -rw-r--r-- | lib/language.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/jabber.php b/lib/jabber.php index 9108d1c47..7d584ad01 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -179,7 +179,7 @@ function jabber_format_entry($profile, $notice) $xs->elementEnd('body'); $xs->elementEnd('html'); - $html = $xs->asString(); + $html = $xs->getString(); return $html . ' ' . $entry; } diff --git a/lib/language.php b/lib/language.php index 6791df699..cd6498d30 100644 --- a/lib/language.php +++ b/lib/language.php @@ -115,7 +115,7 @@ function get_all_languages() { 'he' => array('q' => 0.5, 'lang' => 'he_IL', 'name' => 'Hebrew', 'direction' => 'rtl'), 'it' => array('q' => 1, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'ltr'), 'jp' => array('q' => 0.5, 'lang' => 'ja_JP', 'name' => 'Japanese', 'direction' => 'ltr'), - 'ko' => array('q' => 0.9, 'lang' => 'ko', 'name' => 'Korean', 'direction' => 'ltr'), + 'ko' => array('q' => 0.9, 'lang' => 'ko_KR', 'name' => 'Korean', 'direction' => 'ltr'), 'mk' => array('q' => 0.5, 'lang' => 'mk_MK', 'name' => 'Macedonian', 'direction' => 'ltr'), 'nb' => array('q' => 0.1, 'lang' => 'nb_NO', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'), 'no' => array('q' => 0.1, 'lang' => 'nb_NO', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'), |