diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-09-17 20:23:05 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-09-17 20:23:05 +0000 |
| commit | 7a5de04e51daa102840a02af6b9ce8138d08c4bb (patch) | |
| tree | a3f8bcb9ac961523b4835b8865c152c8835f25e7 /modules/gallery/libraries/Gallery_I18n.php | |
| parent | f96a75f2b13a0bd7a37b320aa5655f67868ca80d (diff) | |
| parent | 3e1743b21fd35b9d6d540e827292f1f4f006b531 (diff) | |
Pulled latest source from upstream.
Diffstat (limited to 'modules/gallery/libraries/Gallery_I18n.php')
| -rw-r--r-- | modules/gallery/libraries/Gallery_I18n.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php index f8068eec..6cb36f07 100644 --- a/modules/gallery/libraries/Gallery_I18n.php +++ b/modules/gallery/libraries/Gallery_I18n.php @@ -44,7 +44,7 @@ function t($message, $options=array()) { */ function t2($singular, $plural, $count, $options=array()) { return Gallery_I18n::instance()->translate(array("one" => $singular, "other" => $plural), - array_merge($options, array("count" => $count))); + array_merge($options, array("count" => $count))); } class Gallery_I18n_Core { @@ -175,7 +175,7 @@ class Gallery_I18n_Core { ->execute() as $row) { $translations[$row->key] = unserialize($row->translation); } - + // Override incoming with outgoing... foreach (db::build() ->select("key", "translation") @@ -184,7 +184,7 @@ class Gallery_I18n_Core { ->execute() as $row) { $translations[$row->key] = unserialize($row->translation); } - + $cache->set($cache_key, $translations, array("translation"), 0); } return $translations; |
