Added constants for locales

9 years ago · 1212ef51f7
parent 062d5aeb4f
commit 1212ef51f7
2 changed files with 22 additions and 20 deletions
--- a/includes/locale.php
+++ b/includes/locale.php
@ -30,10 +30,8 @@ $_SESSION["locale"] = $locale;
 putenv("LANG=" . $_SESSION["locale"]);                                                                                                                                                                
 setlocale(LC_ALL, $_SESSION["locale"]);                                                                                                                                                               
                                                                                                                                                                                          
-$domain = "messages";                                                                                                                                                                     
-$locale_root = "locale";                                                                                                                                              
-bindtextdomain($domain, $locale_root);                                                                                                                                                    
-bind_textdomain_codeset($domain, 'UTF-8');                                                                                                                                                
+bindtextdomain(LOCALE_DOMAIN, LOCALE_ROOT);                                                                                                                                                    
+bind_textdomain_codeset(LOCALE_DOMAIN, 'UTF-8');                                                                                                                                                
                                                                                                                                                                                          
-textdomain($domain);                                                                                                                                                                      
+textdomain(LOCALE_DOMAIN);                                                                                                                                                                      
 ?>
--- a/index.php
+++ b/index.php
@ -43,6 +43,10 @@ define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc');
 define('RASPI_OPENVPN_ENABLED', false );
 define('RASPI_TORPROXY_ENABLED', false );

+// Locale settings
+define('LOCALE_ROOT', 'locale');
+define('LOCALE_DOMAIN', 'messages'); 
+
 include_once( RASPI_CONFIG.'/raspap.php' );
 include_once( 'includes/locale.php');
 include_once( 'includes/functions.php' );