From df302d28e62f9bd83d2d504578aec8e6434711bd Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 13:05:37 -0700
Subject: remove duplicate function definition

---
 modules/gallery/helpers/locales.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 17286adf..2cd8b0c2 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -138,7 +138,7 @@ class locales_Core {
 
   static function set_request_locale() {
     // 1. Check the session specific preference (cookie)
-    $locale = user::cookie_locale();
+    $locale = self::cookie_locale();
     // 2. Check the user's preference
     if (!$locale) {
       $locale = user::active()->locale;
@@ -237,23 +237,6 @@ class locales_Core {
     return array(null, 0);
   }
 
-  static function set_request_locale() {
-    // 1. Check the session specific preference (cookie)
-    $locale = self::cookie_locale();
-    // 2. Check the user's preference
-    if (!$locale) {
-      $locale = user::active()->locale;
-    }
-    // 3. Check the browser's / OS' preference
-    if (!$locale) {
-      $locale = locales::locale_from_http_request();
-    }
-    // If we have any preference, override the site's default locale
-    if ($locale) {
-      I18n::instance()->locale($locale);
-    }
-  }
-
   static function cookie_locale() {
     $cookie_data = Input::instance()->cookie("g_locale");
     $locale = null;
-- 
cgit v1.2.3