Changeset 1074

Timestamp:

03/23/08 16:11:52 (8 months ago)

Author:

rats

Message:

Fixed #836: Static awstats in user's language

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/cron.d/parts/dmn_awstats_entry.tpl (modified) (1 diff)
• trunk/engine/ispcp-dmn-mngr (modified) (3 diffs)
• trunk/language-files/portugues/portuguese_brazilian (moved) (moved from trunk/language-files/portugues/portugues_brazil) (2 diffs)

trunk/CHANGELOG

@@ -5 +5 @@
-        - GUI:
-                * Fixed: Warnings and Notices if no Database found or no conection to it
+        - ENGINE:
+                * Fixed #836: Static awstats in user's language
-
-2008-03-22 Benedikt Heintel

trunk/configs/cron.d/parts/dmn_awstats_entry.tpl

@@ -1 @@
-en
+{USER_LANG}

trunk/engine/ispcp-dmn-mngr

@@ -4017 +4017 @@
-
-sub dmn_add_awstats_cron {
+    push_el(\@main::el, 'dmn_add_awstats_cron()', 'Starting...');
+
-    my ($dmn_data) = @_;
-
-    my ($rs, $awstats_b, $awstats_entry, $awstats_e) = (undef, undef, undef, undef);
-
-    push_el(\@main::el, 'dmn_add_awstats_cron()', 'Starting...');
-
-    if (!defined($dmn_data) || $dmn_data eq '') {
@@ -4044 +4044 @@
-    my $timestamp       = time;
-    my $backup_cfg      = "$backup_dir/ispcp.$timestamp";
+    my $user_lang       = en;
+
+    # Selecting user language
+    my $user_id = @$dmn_data[4];
+    my $sql = "SELECT `lang` FROM `user_gui_props` WHERE `user_id` = ".$user_id.";";
+    ($rs, $rdata) = doSQL($sql);
+    return $rs if ($rs != 0);
+
+    my %languages = (
+                "lang_Albanian" => "al",
+                "lang_Bosnian" => "ba",
+                "lang_Bulgarian" => "bg",
+                "lang_Catalan" => "ca",
+                "lang_ChineseTaiwan" => "tw",
+                "lang_Chinese" => "cn",
+                "lang_Czech" => "cz",
+                "lang_Danish" => "dk",
+                "lang_Dutch" => "nl",
+                "lang_English" => "en",
+                "lang_Estonian" => "et",
+                "lang_Euskara" => "eu",
+                "lang_Finish" => "fi",
+                "lang_FrenchFrance" => "fr",
+                "lang_Galician" => "gl",
+                "lang_GermanAustria" => "de",
+                "lang_GermanGermany" => "de",
+                "lang_GermanSwiss" => "de",
+                "lang_Greek" => "gr",
+                "lang_Hebrew" => "he",
+                "lang_Hungarian" => "hu",
+                "lang_Icelandic" => "is",
+                "lang_Indonesian" => "id",
+                "lang_Italian" => "it",
+                "lang_Japanese" => "jp",
+                "lang_Korean" => "kr",
+                "lang_Latvian" => "lv",
+                "lang_NorwegianNyorsk" => "nn",
+                "lang_NorwegianBokmal" => "nb",
+                "lang_Polish" => "pl",
+                "lang_Portuguese" => "pt",
+                "lang_PortuguesBrazil" => "br",
+                "lang_Romanian" => "ro",
+                "lang_Russian" => "ru",
+                "lang_Serbian" => "sr",
+                "lang_Slovak" => "sk",
+                "lang_Slovenian" => "si",
+                "lang_SpanishArgentina" => "es",
+                "lang_SpanishSpain" => "es",
+                "lang_Swedisch" => "se",
+                "lang_Turkish" => "tr",
+                "lang_Ukrainian" => "ua",
+                "lang_Welsh" => "cy
+        )
+
+        foreach $key (keys %$languages) {
+        if ($key == $rdata[0]) {
+                        $user_lang = $languages->{$key};
+                        break;
+        }
+    }
-
-    #
@@ -4072 +4132 @@
-                    '{DMN_NAME}' => $dmn_name,
-                    '{MINUTE}' => $cronjob_minute,
-
+
+
-                   );
-

trunk/language-files/portugues/portuguese_brazilian

@@ -1 @@
-Brazil
+eBrazilian
-ispcp_language = Portugues (Brazil)
-ispcp_languageSetlocaleValue = pt_BR
@@ -465 +465 @@
-Daily backup = Backup diário
-Login with your FTP account = Login com sua conta de FTP
- 
+
-Restore backup = Restaurar backup
-Restore = Restaurar