Localisation in Debian (package) fix

Author: Vitexus

debian/conf/icinga-editor.conf

@@ -18,7 +18,7 @@ Alias /icinga-editor /usr/share/icinga-editor
 		php_admin_flag allow_url_fopen On
 		php_value include_path .:/usr/share/php:/usr/share/icinga-editor/classes
 #		php_admin_value upload_tmp_dir /var/lib/icinga-editor/tmp
-		php_admin_value open_basedir /usr/share/icinga-editor/:/etc/icinga-editor/:/etc/icinga/generated/:/var/lib/icinga-editor/:/usr/share/php/:/usr/share/javascript/:/usr/share/php/:/var/lib/icinga-editor/:/var/tmp:/tmp:/etc/apache2/conf-enabled/:/usr/share/icinga/htdocs/images/logos/:/usr/share/nagios/htdocs/images
+		php_admin_value open_basedir /usr/share/icinga-editor/:/etc/icinga-editor/:/etc/icinga/generated/:/var/lib/icinga-editor/:/usr/share/php/:/usr/share/javascript/:/usr/share/locale:/var/lib/icinga-editor/:/var/tmp:/tmp:/etc/apache2/conf-enabled/:/usr/share/icinga/htdocs/images/logos/:/usr/share/nagios/htdocs/images
 	</IfModule>
 
 # enable gzip compression

debian/install

@@ -18,3 +18,5 @@ debian/conf/icinga-editor etc/sudoers.d
 debian/plugins/*        usr/lib/nagios/plugins
 debian/bin/iecfgimporter.php        usr/bin
 
+locale/cs_CZ/LC_MESSAGES/*.mo       usr/share/locale/cs_CZ/LC_MESSAGES
+locale/en_US/LC_MESSAGES/*.mo       usr/share/locale/cs_CZ/LC_MESSAGES

debian/rules

@@ -6,5 +6,6 @@
 override_dh_install:
 	dh_install
 	sed -i -e 's/..\//.\//g' debian/icinga-editor/usr/share/icinga-editor/about.php
+	sed -i -e 's/..\/locale/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
 	sed -i -e 's/..\/vendor/\/var\/lib\/icinga-editor/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
 	sed -i -e 's/..\/i18n/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php

src/locale/cs_CZ/LC_MESSAGES/messages.mo locale/cs_CZ/LC_MESSAGES/icinga-editor.mosrc/locale/cs_CZ/LC_MESSAGES/messages.mo renamed to locale/cs_CZ/LC_MESSAGES/icinga-editor.mo

@@ -29,18 +29,18 @@
     }
 }
 setlocale(LC_ALL, $locale);
-bind_textdomain_codeset('iciedit', 'UTF-8');
+bind_textdomain_codeset('icinga-editor', 'UTF-8');
 putenv("LC_ALL=$locale");
 if (file_exists('../locale')) {
-    bindtextdomain('messages', '../locale');
+    bindtextdomain('icinga-editor', '../locale');
 }
-textdomain('messages');
+textdomain('icinga-editor');
 
 session_start();
 
-/*
+/**
  * Objekt uživatele VSUser nebo VSAnonym
- * @global EaseUser
+ * @global \Ease\User
  */
 $oUser = \Ease\Shared::user();
 $oUser->settingsColumn = 'settings';