[debian-edu-commits] debian-edu/slbackup-php.git (#24) - edu-wheezy (branch) updated: debian/0.3-2.2-23-ge17123b

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  e17123b5eabae6e71e172ed9026d106466cabdaa (commit)
      from  ddb32c09d53265ca2d86ac9d44e60c05301b63ad (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  |   26 +++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 23c148d..376d08e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ slbackup-php (0.3-3) UNRELEASED; urgency=low
     detect locales like de_DE.UTF-8 from a .mo files named de.po.
   * Add patch: 101_slbackup-php_i18n-de.patch, German translation for SL-Backup
     (WebGUI).
+  * Update patch: 100_slbackup-php_fix-language-detection.patch. Detect
+    Norwegian (nb_NO) locale and set it. (Browser still in English.)
 
  -- 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
index 83b9dcd..0f4216e 100644
--- a/debian/patches/100_slbackup-php_fix-language-detection.patch
+++ b/debian/patches/100_slbackup-php_fix-language-detection.patch
@@ -1,5 +1,7 @@
---- a/src/functions.php
-+++ b/src/functions.php
+Index: slbackup-php/src/functions.php
+===================================================================
+--- slbackup-php.orig/src/functions.php	2012-01-18 16:17:18.000000000 +0100
++++ slbackup-php/src/functions.php	2012-01-18 16:20:06.000000000 +0100
 @@ -60,13 +60,15 @@
  }
  
@@ -20,7 +22,7 @@
  	    }
  	}
  	closedir ($handle) ; 
-@@ -76,32 +78,50 @@
+@@ -76,32 +78,56 @@
  	    $lang_accept[$i] = split(";", $lang_accept[$i]) ; 
  	    $lang_accept[$i] = $lang_accept[$i][0] ; 
  	}
@@ -51,10 +53,20 @@
 +		$found_locale=$locale_exact ; 
 +	    elseif (isset ($locale_match))
 +		$found_locale=$locale_match ; 
-+	}
+ 	}
+-	if (isset ($locale_exact)) 
+-	    $found_locale=$locale_exact ; 
+-	elseif (isset ($locale_match))
+-	    $found_locale=$locale_match ; 
 +
++	$locales = array();
 +	$locales_utf8 = array();
 +	if (isset($found_locale) && !empty($lang_accept[0])) {
++	    $found_locale_tuple = split('_', $found_locale)
++	    if (count($found_locale_tuple) > 1) {
++		$locales[] = $found_locale;
++		$locales_utf8[] = $found_locale.'.UTF-8';
++	    }
 +	    foreach ($lang_accept as $lang) {
 +		$lang_tuple = split('-',$lang);
 +		if (count($lang_tuple) > 1) {
@@ -66,11 +78,7 @@
 +	    }
 +	    $locales_all = array_merge ($locales_utf8, $locales);
 +	    $found_locale = setlocale (LC_ALL, $locales_all) ; 
- 	}
--	if (isset ($locale_exact)) 
--	    $found_locale=$locale_exact ; 
--	elseif (isset ($locale_match))
--	    $found_locale=$locale_match ; 
++	}
 +
  	if (isset ($found_locale))
  	    setcookie ( 'locale', $found_locale) ;


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).