diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-09-07 18:53:25 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-09-07 18:53:25 -0700 |
| commit | 5a26dd542a3cb4974870bcfeec4864d1daa616c4 (patch) | |
| tree | dede0baa9ba893a4987bffc7ddaf925694e5ddde /modules/gallery/libraries/Gallery_I18n.php | |
| parent | b6fa33faf789749f4de3f4eadf8832748372c980 (diff) | |
| parent | d398651c080c18e4f1bf623548091465dac1d528 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
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; |