From 1cf882aff9f282f79a75d9078a42ff75b640d855 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 23 May 2010 13:13:03 +0200
Subject: start cleaning

---
 03_fix_locale_location.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 03_fix_locale_location.patch

(limited to '03_fix_locale_location.patch')

diff --git a/03_fix_locale_location.patch b/03_fix_locale_location.patch
new file mode 100644
index 0000000..148a9d0
--- /dev/null
+++ b/03_fix_locale_location.patch
@@ -0,0 +1,41 @@
+diff -urNad gosa-2.6.0+svn11288~/include/php_setup.inc gosa-2.6.0+svn11288/include/php_setup.inc
+--- gosa-2.6.0+svn11288~/include/php_setup.inc	2008-06-11 15:55:59.000000000 +0200
++++ gosa-2.6.0+svn11288/include/php_setup.inc	2008-06-11 15:56:00.000000000 +0200
+@@ -20,7 +20,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-define ("LOCALE_DIR", dirname(dirname(__FILE__))."/locale/compiled");
++define ("LOCALE_DIR", "/var/cache/gosa/locale");
+ 
+ function gosaRaiseError($errno, $errstr, $errfile, $errline)
+ {
+diff -urNad gosa-2.6.0+svn11288~/update-gosa gosa-2.6.0+svn11288/update-gosa
+--- gosa-2.6.0+svn11288~/update-gosa	2008-06-11 15:55:59.000000000 +0200
++++ gosa-2.6.0+svn11288/update-gosa	2008-06-11 16:02:30.000000000 +0200
+@@ -169,20 +169,20 @@
+ 
+ 	/* For each language, merge the target .mo to the compiled directory. */
+ 	foreach ($languages as $language => $po_files){
+-		if (!is_dir(LOCALE_DIR."/compiled/${language}/LC_MESSAGES")){
+-			if (!mkdir (LOCALE_DIR."/compiled/${language}/LC_MESSAGES", 0755, TRUE)){
+-				echo "Failed to create '".LOCALE_DIR."/compiled/${language}/LC_MESSAGES'- aborted";
++		if (!is_dir("/var/cache/gosa/locale/${language}/LC_MESSAGES")){
++			if (!mkdir ("/var/cache/gosa/locale/${language}/LC_MESSAGES", 0755, TRUE)){
++				echo "Failed to create '/var/cache/gosa/locale/${language}/LC_MESSAGES'- aborted";
+ 				exit (3);
+ 			}
+ 		}
+ 
+ 		/* Cat all these po files into one single file */
+-		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
++		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > /var/cache/gosa/locale/${language}/LC_MESSAGES/messages.po)", $val);
+ 		if ($val != 0){
+ 			echo "Merging of message files failed - aborted";
+ 			exit (4);
+ 		}
+-		system ("(cd ".LOCALE_DIR."/compiled/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
++		system ("(cd /var/cache/gosa/locale/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
+ 		if ($val != 0){
+ 			echo "Compiling of message files failed - aborted";
+ 			exit (5);
-- 
cgit