[debian-edu-commits] debian-edu/slbackup-php.git (#15) - edu-wheezy (branch) updated: debian/0.3-2.2-14-ge3e0bd0

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  e3e0bd07629fe65ee67a56badba34b15ad925a12 (commit)
      from  23b8026285b4e02192d90872edb9a7aee3f70183 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                       |    2 ++
 .../100_slbackup-php_fix-language-detection.patch      |   16 ++++++++++++++++
 debian/patches/series                                  |    1 +
 3 files changed, 19 insertions(+)
 create mode 100644 debian/patches/100_slbackup-php_fix-language-detection.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cfc0337..a0c38eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ slbackup-php (0.3-2.3) UNRELEASED; urgency=low
   * Add/update patch headers.
   * Update patch: 001_slbackup-php_cookie+request-merge.patch. Allow `locale'
     as $_COOKIE key.
+  * Add patch: 100_slbackup-php_fix-language-detection.patch. Automatically
+    detect locales like de_DE.UTF-8 from a .mo files named de.po.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Jan 2012 13:40:20 +0100
 
diff --git a/debian/patches/100_slbackup-php_fix-language-detection.patch b/debian/patches/100_slbackup-php_fix-language-detection.patch
new file mode 100644
index 0000000..f321db2
--- /dev/null
+++ b/debian/patches/100_slbackup-php_fix-language-detection.patch
@@ -0,0 +1,16 @@
+--- a/src/functions.php
++++ b/src/functions.php
+@@ -100,8 +100,11 @@
+ 	
+     if (isset ($found_locale)) {
+         $locale = setlocale (LC_ALL, $found_locale) ; 
+-	if (empty($locale)) 
+-	    setlocale (LC_ALL, $found_locale . ".UTF8"); 
++	if (empty($locale)) {
++	    $locale = setlocale (LC_ALL, $found_locale . ".UTF8");
++	    if (empty($locale))
++		$locale = setlocale (LC_ALL, $found_locale . "_" . strtoupper($found_locale) . ".UTF8");
++	}
+ 	bindtextdomain ("slbackup-php", "../locales/"); 
+ 	bind_textdomain_codeset ("slbackup-php", "UTF-8");
+ 	textdomain ("slbackup-php"); 
diff --git a/debian/patches/series b/debian/patches/series
index 3797a49..b7900a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 001_slbackup-php_cookie+request-merge.patch
 002_slbackup-php_restore-paths-with-blanks.patch
+100_slbackup-php_fix-language-detection.patch
 101_slbackup-php_i18n-de.patch


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).