Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 7 insertions, 2 deletions

diff --git a/modules/gallery/libraries/I18n.php b/modules/gallery/libraries/I18n.php
index 03a6d8f6..d0531b9a 100644
--- a/modules/gallery/libraries/I18n.php
+++ b/modules/gallery/libraries/I18n.php
@@ -77,7 +77,12 @@ class I18n_Core {
       // TODO: See G2 for better fallack code.
       $locale_prefs = array($locale);
       $locale_prefs[] = 'en_US';
-      setlocale(LC_ALL, $locale_prefs);
+      $new_locale = setlocale(LC_ALL, $locale_prefs);
+      if (is_string($new_locale) && strpos($new_locale, 'tr') === 0) {
+        // Make PHP 5 work with Turkish (the localization results are mixed though).
+        // Hack for http://bugs.php.net/18556
+        setlocale(LC_CTYPE, 'C');
+      }
     }
     return $this->_config['default_locale'];
   }
@@ -178,7 +183,7 @@ class I18n_Core {
   static function is_plural_message($message) {
     return is_array($message);
   }
-  
+
   private function interpolate($locale, $string, $values) {
     // TODO: Handle locale specific number formatting.