Changeset 1877 in ExiteCMS

Timestamp:

10/19/08 16:53:47 (3 years ago)

Author:

hverton

Message:

updated the translation module to work with the new default_locale setting

Location:

trunk

Files:

• administration/tools/language_pack_English.php (modified) (2 diffs)
• administration/tools/language_pack_Nederlands.php (modified) (2 diffs)
• administration/tools/templates/admin.tools.languagepack.tpl (modified) (2 diffs)
• files/locales/en.main.global.php (modified) (1 diff)
• files/locales/en.main.setup.php (modified) (1 diff)
• files/locales/nl.main.global.php (modified) (1 diff)
• files/locales/nl.main.setup.php (modified) (1 diff)
• setup.php (modified) (2 diffs)

trunk/administration/tools/language_pack_English.php

@@ -3746 +3746 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "us|gb|ca|au|nz|in|za|ir|mt|hk|pr");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1224413129");
+if (!defined('LP_DATE')) define('LP_DATE', "1224427994");
 $lp_date = LP_DATE;
 
@@ -3849 +3849 @@
         // check if this language pack has been installed
         $variables['can_install'] = dbcount("(*)", "locale", "locale_code = '".LP_LOCALE."'") == 0;
-        $variables['can_remove'] = LP_LOCALE != "en" && $variables['can_install'] == false;
+        $variables['can_remove'] = LP_LOCALE != $settings['default_locale'] && $variables['can_install'] == false;
         $variables['can_upgrade'] = $variables['can_install'] == false && $variables['last_update'] < LP_DATE;
     

trunk/administration/tools/language_pack_Nederlands.php

@@ -3746 +3746 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1224413132");
+if (!defined('LP_DATE')) define('LP_DATE', "1224427997");
 $lp_date = LP_DATE;
 
@@ -3849 +3849 @@
         // check if this language pack has been installed
         $variables['can_install'] = dbcount("(*)", "locale", "locale_code = '".LP_LOCALE."'") == 0;
-        $variables['can_remove'] = LP_LOCALE != "en" && $variables['can_install'] == false;
+        $variables['can_remove'] = LP_LOCALE != $settings['default_locale'] && $variables['can_install'] == false;
         $variables['can_upgrade'] = $variables['can_install'] == false && $variables['last_update'] < LP_DATE;
     

trunk/administration/tools/templates/admin.tools.languagepack.tpl

@@ -61 +61 @@
                 </td>
             </tr>
+            {if $last_update}
             <tr>
                 <td class='tbl' width='50%' align='right'>
@@ -69 +70 @@
                 </td>
             </tr>
+            {/if}
             {if $smarty.const.LP_VERSION != $settings.version}
             <tr>

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Sun Oct 19 2008, 11:35:26 CEST
+// generated on : Sun Oct 19 2008, 16:53:05 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/en.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Sun Oct 19 2008, 11:35:14 CEST
+// generated on : Sun Oct 19 2008, 16:53:14 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/nl.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Sun Oct 19 2008, 11:35:17 CEST
+// generated on : Sun Oct 19 2008, 16:53:17 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/nl.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Sun Oct 19 2008, 11:35:17 CEST
+// generated on : Sun Oct 19 2008, 16:53:17 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/setup.php

@@ -392 +392 @@
             $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$username."' WHERE cfg_name = ''siteusername");
             $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$localeset."' WHERE cfg_name = 'locale'");
-            $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".LP_CHARSET."' WHERE cfg_name = 'default_locale'");
+            $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".LP_LOCALE."' WHERE cfg_name = 'default_locale'");
  
             // create the admin rights field for the webmaster, based on all admin modules available
@@ -403 +403 @@
             // add the webmaster to the users table
             $commands = array();
-            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##users (user_name, user_password, user_webmaster, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_forum_fullscreen, user_theme, user_locale, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status) VALUES ('$username', '$password', '1', '$email', '1', '', '0000-00-00', '', '', '', '', '', '0', 'Default', '".LP_CHARSET."', '0', '', '', '0', '".time()."', '0', '0.0.0.0', '".$adminrights."', '', '103', '0')");
+            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##users (user_name, user_password, user_webmaster, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_forum_fullscreen, user_theme, user_locale, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status) VALUES ('$username', '$password', '1', '$email', '1', '', '0000-00-00', '', '', '', '', '', '0', 'Default', '".LP_LOCALE."', '0', '', '', '0', '".time()."', '0', '0.0.0.0', '".$adminrights."', '', '103', '0')");
             $result = dbcommands($commands, $db_prefix);