From 3ed7a5af46586f186a4627d8b029aec7c3ff579d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 24 Nov 2009 19:24:02 -0800
Subject: Rename I18n to Gallery_I18n to avoid conflict with Kohana 2.4

---
 modules/gallery/helpers/l10n_scanner.php | 2 +-
 modules/gallery/helpers/locales.php      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index a8059b3a..e36d419d 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -37,7 +37,7 @@ class l10n_scanner_Core {
       }
     }
 
-    $key = I18n::get_message_key($message);
+    $key = Gallery_I18n::get_message_key($message);
     if (array_key_exists($key, $cache)) {
       return $cache[$key];
     }
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 2de029ff..8d76e333 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -125,13 +125,13 @@ class locales_Core {
     if (empty(self::$locales)) {
       self::_init_language_data();
     }
-    $locale or $locale = I18n::instance()->locale();
+    $locale or $locale = Gallery_I18n::instance()->locale();
 
     return self::$locales["$locale"];
   }
 
   static function is_rtl($locale=null) {
-    $locale or $locale = I18n::instance()->locale();
+    $locale or $locale = Gallery_I18n::instance()->locale();
     list ($language, $territory) = explode('_', $locale . "_");
     return in_array($language, array("he", "fa", "ar"));
   }
@@ -233,7 +233,7 @@ class locales_Core {
     }
     // If we have any preference, override the site's default locale
     if ($locale) {
-      I18n::instance()->locale($locale);
+      Gallery_I18n::instance()->locale($locale);
     }
   }
 
-- 
cgit v1.2.3