diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-09 20:33:31 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-09 20:33:31 -0700 |
| commit | f55686c7ef2ca5f3c2c78588e39ac717064c5e09 (patch) | |
| tree | 7e6737d27ad436dff4a48c4558ea9d4a97f48581 | |
| parent | a20246b7382ea828157e358dd5ed62ed05db5193 (diff) | |
| parent | 7e4fcb97cb4a575811c1e84ced07fbaf4d7ed7ba (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/helpers/l10n_client.php | 7 | ||||
| -rw-r--r-- | modules/gallery/views/admin_advanced_settings.html.php | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php index 33f23857..20f81ecc 100644 --- a/modules/gallery/helpers/l10n_client.php +++ b/modules/gallery/helpers/l10n_client.php @@ -123,7 +123,12 @@ class l10n_client_Core { $key = $message_data->key; $locale = $message_data->locale; $revision = $message_data->rev; - $translation = serialize(json_decode($message_data->translation)); + $translation = json_decode($message_data->translation); + if (!is_string($translation)) { + // Normalize stdclass to array + $translation = (array) $translation; + } + $translation = serialize($translation); // @todo Should we normalize the incoming_translations table into messages(id, key, message) // and incoming_translations(id, translation, locale, revision)? Or just allow diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index 34abadea..b4dedaef 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -6,7 +6,7 @@ </p> <ul id="gMessage"> <li class="gWarning"> - <b><?= t("Change these values at your own risk!</b>") ?> + <b><?= t("Change these values at your own risk!") ?> </li> </ul> |