Changeset 1883 in ExiteCMS


Ignore:
Timestamp:
10/19/08 20:42:19 (3 years ago)
Author:
hverton
Message:

fixed issue with character escaping in locale files

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/administration/tools/language_pack_English.php

    r1877 r1883  
    32523252        $localestrings['633'] = "Toggle smileys"; 
    32533253        $localestrings['634'] = "Allow others to see when I have read a message:"; 
    3254         $localestrings['635'] = "Auto archive %1\$s / %2\ss messages after:"; 
     3254        $localestrings['635'] = "Auto archive %1\$s / %2\$s messages after:"; 
    32553255        $localestrings['636'] = "Never"; 
    32563256        $localestrings['637'] = "days"; 
    … …  
    37463746if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "us|gb|ca|au|nz|in|za|ir|mt|hk|pr"); 
    37473747if (!defined('LP_VERSION')) define('LP_VERSION', "7.20"); 
    3748 if (!defined('LP_DATE')) define('LP_DATE', "1224427994"); 
     3748if (!defined('LP_DATE')) define('LP_DATE', "1224441621"); 
    37493749$lp_date = LP_DATE; 
    37503750 

  • trunk/administration/tools/language_pack_Nederlands.php

    r1881 r1883  
    37463746if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an"); 
    37473747if (!defined('LP_VERSION')) define('LP_VERSION', "7.20"); 
    3748 if (!defined('LP_DATE')) define('LP_DATE', "1224430375"); 
     3748if (!defined('LP_DATE')) define('LP_DATE', "1224441624"); 
    37493749$lp_date = LP_DATE; 
    37503750 

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

    r1877 r1883  
    33// locale       : English 
    44// locale name  : main.global 
    5 // generated on : Sun Oct 19 2008, 16:53:05 CEST 
     5// generated on : Sun Oct 19 2008, 20:40:16 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 

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

    r1877 r1883  
    33// locale       : English 
    44// locale name  : main.setup 
    5 // generated on : Sun Oct 19 2008, 16:53:14 CEST 
     5// generated on : Sun Oct 19 2008, 20:40:21 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 

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

    r1877 r1883  
    33// locale       : English 
    44// locale name  : main.global 
    5 // generated on : Sun Oct 19 2008, 16:53:17 CEST 
     5// generated on : Sun Oct 19 2008, 20:40:24 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 

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

    r1877 r1883  
    33// locale       : English 
    44// locale name  : main.setup 
    5 // generated on : Sun Oct 19 2008, 16:53:17 CEST 
     5// generated on : Sun Oct 19 2008, 20:40:24 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 
    … …  
    124124$locale['552'] = "Beveiliging"; 
    125125$locale['553'] = "Software"; 
    126 $locale['554'] = "Thema\'s"; 
     126$locale['554'] = "Thema's"; 
    127127$locale['555'] = "Windows"; 
    128128$locale['560'] = "Sorry, maar het door u gevraagde document kan niet op de server gevonden worden."; 

  • trunk/includes/locale_functions.php

    r1875 r1883  
    170170                        } 
    171171 
    172                         // search and replace array's 
    173                         $keysearch = array("$", '"', '\'', chr(10), chr(13)); 
    174                         $keyreplace = array("\\$", '\\"', "\\'", "\\n", "\\r"); 
    175                         $search = array("$", '"', chr(10), chr(13)); 
    176                         $replace = array("\\$", '\\"', "\\n", "\\r"); 
     172                        // search and replace array's for keys and values 
     173                        $keysearch = array("'"); 
     174                        $keyreplace = array("\'"); 
     175                        $search = array('"', '$', "\n"); 
     176                        $replace = array('\"', '\$', '\n'); 
    177177 
    178178                        while ($localerec = dbarray($result2)) { 

  • trunk/setup.php

    r1877 r1883  
    413413            // add the default news categories  
    414414            $commands = array(); 
    415             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['540'])."', 'bugs.gif')"); 
    416             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['541'])."', 'downloads.gif')"); 
    417             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['542'])."', 'games.gif')"); 
    418             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['543'])."', 'graphics.gif')"); 
    419             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['544'])."', 'hardware.gif')"); 
    420             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['545'])."', 'journal.gif')"); 
    421             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['546'])."', 'members.gif')"); 
    422             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['547'])."', 'mods.gif')"); 
    423             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['548'])."', 'movies.gif')"); 
    424             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['549'])."', 'network.gif')"); 
    425             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['550'])."', 'news.gif')"); 
    426             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['552'])."', 'security.gif')"); 
    427             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['553'])."', 'software.gif')"); 
    428             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['554'])."', 'themes.gif')"); 
    429             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['555'])."', 'windows.gif')"); 
     415            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['540'])."', 'bugs.gif')"); 
     416            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['541'])."', 'downloads.gif')"); 
     417            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['542'])."', 'games.gif')"); 
     418            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['543'])."', 'graphics.gif')"); 
     419            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['544'])."', 'hardware.gif')"); 
     420            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['545'])."', 'journal.gif')"); 
     421            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['546'])."', 'members.gif')"); 
     422            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['547'])."', 'mods.gif')"); 
     423            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['548'])."', 'movies.gif')"); 
     424            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['549'])."', 'network.gif')"); 
     425            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['550'])."', 'news.gif')"); 
     426            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['552'])."', 'security.gif')"); 
     427            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['553'])."', 'software.gif')"); 
     428            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['554'])."', 'themes.gif')"); 
     429            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".mysql_escape_string($locale['555'])."', 'windows.gif')"); 
    430430            $result = dbcommands($commands, $db_prefix); 
    431431     
    432432            // activate the panels of core modules 
    433433            $commands = array(); 
    434             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".addslashes($locale['520'])."', 'main_menu_panel', '1', '1', 'file', '0', '0', '1')"); 
    435             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".addslashes($locale['524'])."', 'welcome_message_panel', '2', '1', 'file', '0', '0', '1')"); 
    436             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".addslashes($locale['526'])."', 'user_info_panel', '4', 1, 'file', '0', '0', '1')"); 
     434            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".mysql_escape_string($locale['520'])."', 'main_menu_panel', '1', '1', 'file', '0', '0', '1')"); 
     435            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".mysql_escape_string($locale['524'])."', 'welcome_message_panel', '2', '1', 'file', '0', '0', '1')"); 
     436            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".mysql_escape_string($locale['526'])."', 'user_info_panel', '4', 1, 'file', '0', '0', '1')"); 
    437437            $result = dbcommands($commands, $db_prefix); 
    438438 
    439439            // add the default menu links  
    440440            $commands = array(); 
    441             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['500'])."', 'index.php', '0', '1', '0', '1', 'main_menu_panel')"); 
    442             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['501'])."', 'article_cats.php', '0', '1', '0', '2', 'main_menu_panel')"); 
    443             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['502'])."', 'downloads.php', '0', '1', '0', '3', 'main_menu_panel')"); 
    444             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['503'])."', 'faq.php', '0', '1', '0', '4', 'main_menu_panel')"); 
    445             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['504'])."', 'forum/index.php', '0', '1', '0', '5', 'main_menu_panel')"); 
    446             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['505'])."', 'news_cats.php', '0', '1', '0', '6', 'main_menu_panel')"); 
    447             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['473'])."', 'blogs.php', '0', '1', '0', '7', 'main_menu_panel')"); 
    448             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['482'])."', 'albums.php', '0', '1', '0', '8', 'main_menu_panel')"); 
    449             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['506'])."', 'contact.php', '0', '1', '0', '9', 'main_menu_panel')"); 
    450             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['507'])."', 'search.php', '0', '1', '0', '10', 'main_menu_panel')"); 
    451             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['509'])."', 'reports.php', '0', '1', '0', '11', 'main_menu_panel')"); 
    452             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['508'])."', 'register.php', '100', '2', '0', '12', 'main_menu_panel')"); 
     441            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['500'])."', 'index.php', '0', '1', '0', '1', 'main_menu_panel')"); 
     442            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['501'])."', 'article_cats.php', '0', '1', '0', '2', 'main_menu_panel')"); 
     443            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['502'])."', 'downloads.php', '0', '1', '0', '3', 'main_menu_panel')"); 
     444            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['503'])."', 'faq.php', '0', '1', '0', '4', 'main_menu_panel')"); 
     445            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['504'])."', 'forum/index.php', '0', '1', '0', '5', 'main_menu_panel')"); 
     446            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['505'])."', 'news_cats.php', '0', '1', '0', '6', 'main_menu_panel')"); 
     447            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['473'])."', 'blogs.php', '0', '1', '0', '7', 'main_menu_panel')"); 
     448            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['482'])."', 'albums.php', '0', '1', '0', '8', 'main_menu_panel')"); 
     449            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['506'])."', 'contact.php', '0', '1', '0', '9', 'main_menu_panel')"); 
     450            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['507'])."', 'search.php', '0', '1', '0', '10', 'main_menu_panel')"); 
     451            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['509'])."', 'reports.php', '0', '1', '0', '11', 'main_menu_panel')"); 
     452            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".mysql_escape_string($locale['508'])."', 'register.php', '100', '2', '0', '12', 'main_menu_panel')"); 
    453453            $result = dbcommands($commands, $db_prefix); 
    454454 
Note: See TracChangeset for help on using the changeset viewer.