summaryrefslogtreecommitdiffstats
path: root/03_fix_locale_location.patch
blob: 148a9d09aba2ad1f80776bda97b217f148033f50 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
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);