gosa-core/redhat/03_fix_locale_location.patch

   1 diff -urNad gosa-2.6.0+svn11288~/include/php_setup.inc gosa-2.6.0+svn11288/include/php_setup.inc
   2 --- gosa-2.6.0+svn11288~/include/php_setup.inc  2008-06-11 15:55:59.000000000 +0200
   3 +++ gosa-2.6.0+svn11288/include/php_setup.inc   2008-06-11 15:56:00.000000000 +0200
   4 @@ -20,7 +20,7 @@
   5   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   6   */
   7
   8 -define ("LOCALE_DIR", dirname(dirname(__FILE__))."/locale/compiled");
   9 +define ("LOCALE_DIR", "/var/cache/gosa/locale");
  10
  11  function gosaRaiseError($errno, $errstr, $errfile, $errline)
  12  {
  13 diff -urNad gosa-2.6.0+svn11288~/update-gosa gosa-2.6.0+svn11288/update-gosa
  14 --- gosa-2.6.0+svn11288~/update-gosa    2008-06-11 15:55:59.000000000 +0200
  15 +++ gosa-2.6.0+svn11288/update-gosa     2008-06-11 16:02:30.000000000 +0200
  16 @@ -169,20 +169,20 @@
  17
  18         /* For each language, merge the target .mo to the compiled directory. */
  19         foreach ($languages as $language => $po_files){
  20 -               if (!is_dir(LOCALE_DIR."/compiled/${language}/LC_MESSAGES")){
  21 -                       if (!mkdir (LOCALE_DIR."/compiled/${language}/LC_MESSAGES", 0755, TRUE)){
  22 -                               echo "Failed to create '".LOCALE_DIR."/compiled/${language}/LC_MESSAGES'- aborted";
  23 +               if (!is_dir("/var/cache/gosa/locale/${language}/LC_MESSAGES")){
  24 +                       if (!mkdir ("/var/cache/gosa/locale/${language}/LC_MESSAGES", 0755, TRUE)){
  25 +                               echo "Failed to create '/var/cache/gosa/locale/${language}/LC_MESSAGES'- aborted";
  26                                 exit (3);
  27                         }
  28                 }
  29
  30                 /* Cat all these po files into one single file */
  31 -               system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
  32 +               system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > /var/cache/gosa/locale/${language}/LC_MESSAGES/messages.po)", $val);
  33                 if ($val != 0){
  34                         echo "Merging of message files failed - aborted";
  35                         exit (4);
  36                 }
  37 -               system ("(cd ".LOCALE_DIR."/compiled/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
  38 +               system ("(cd /var/cache/gosa/locale/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
  39                 if ($val != 0){
  40                         echo "Compiling of message files failed - aborted";
  41                         exit (5);