From f2aad0b6a2dd3ca38d03832dc974c84a301a4237 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 13 Mar 2012 11:24:48 +0100 Subject: [PATCH] Added missing language vars and removed useless ones Purge caches via install file --- contrib/update_106_to_200/update.xml | 20 ++----------------- contrib/update_200b1_to_200/update.xml | 20 ++----------------- install.xml | 20 ++----------------- root/install/index.php | 8 +++++++- root/language/de/mods/info_acp_portal.php | 2 -- .../portal/portal_birthday_list_module.php | 1 - .../de/mods/portal/portal_donation_module.php | 4 ---- .../mods/portal/portal_topposters_module.php | 3 +++ .../mods/portal/portal_attachments_module.php | 1 - .../portal/portal_birthday_list_module.php | 1 - .../en/mods/portal/portal_donation_module.php | 8 ++------ .../en/mods/portal/portal_news_module.php | 1 - .../en/mods/portal/portal_poll_module.php | 2 -- 13 files changed, 18 insertions(+), 73 deletions(-) diff --git a/contrib/update_106_to_200/update.xml b/contrib/update_106_to_200/update.xml index 673ef8dc..f65226a9 100644 --- a/contrib/update_106_to_200/update.xml +++ b/contrib/update_106_to_200/update.xml @@ -174,23 +174,7 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3 install/index.php - "Styles" > "Templates" > jedes > "Aktualisieren" - "Administrations-Bereich" (ACP) > "Styles" > "Themes" > jedes > "Aktualisieren" - "Administrations-Bereich" (ACP) > "Styles" > "Grafiksammlungen" > jedes > "Aktualisieren" - -Leere den Cache im "Administrations-Bereich" (ACP) > "Allgemein" > "Den Cache leeren" -]]> - "Styles" > "Templates" > each > "refresh" - "Administration Control Panel" (ACP) > "Styles" > "Themes" > each > "refresh" - "Administration Control Panel" (ACP) > "Styles" > "Imagesets" > each > "refresh" - -Clear your cache in the "Administration Control Panel" (ACP) > "General" > "Purge the cache" -]]> + + \ No newline at end of file diff --git a/contrib/update_200b1_to_200/update.xml b/contrib/update_200b1_to_200/update.xml index fa9b1b5b..610bb737 100644 --- a/contrib/update_200b1_to_200/update.xml +++ b/contrib/update_200b1_to_200/update.xml @@ -139,23 +139,7 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3 install/index.php - "Styles" > "Templates" > jedes > "Aktualisieren" - "Administrations-Bereich" (ACP) > "Styles" > "Themes" > jedes > "Aktualisieren" - "Administrations-Bereich" (ACP) > "Styles" > "Grafiksammlungen" > jedes > "Aktualisieren" - -Leere den Cache im "Administrations-Bereich" (ACP) > "Allgemein" > "Den Cache leeren" -]]> - "Styles" > "Templates" > each > "refresh" - "Administration Control Panel" (ACP) > "Styles" > "Themes" > each > "refresh" - "Administration Control Panel" (ACP) > "Styles" > "Imagesets" > each > "refresh" - -Clear your cache in the "Administration Control Panel" (ACP) > "General" > "Purge the cache" -]]> + + \ No newline at end of file diff --git a/install.xml b/install.xml index ba4eef50..bbf84552 100644 --- a/install.xml +++ b/install.xml @@ -337,23 +337,7 @@ Deny from All install/index.php - "Styles" > "Templates" > jedes > "Aktualisieren" - "Administrations-Bereich" (ACP) > "Styles" > "Themes" > jedes > "Aktualisieren" - "Administrations-Bereich" (ACP) > "Styles" > "Grafiksammlungen" > jedes > "Aktualisieren" - -Leere den Cache im "Administrations-Bereich" (ACP) > "Allgemein" > "Den Cache leeren" -]]> - "Styles" > "Templates" > each > "refresh" - "Administration Control Panel" (ACP) > "Styles" > "Themes" > each > "refresh" - "Administration Control Panel" (ACP) > "Styles" > "Imagesets" > each > "refresh" - -Clear your cache in the "Administration Control Panel" (ACP) > "General" > "Purge the cache" -]]> + + \ No newline at end of file diff --git a/root/install/index.php b/root/install/index.php index ee13e0e6..ce4485c2 100644 --- a/root/install/index.php +++ b/root/install/index.php @@ -354,7 +354,13 @@ $versions = array( ), '2.0.0' => array( - // no changes + // no changes ... purge caches anyways + 'cache_purge' => array( + 'imageset', + 'template', + 'theme', + '', + ), ), ); diff --git a/root/language/de/mods/info_acp_portal.php b/root/language/de/mods/info_acp_portal.php index 22350551..d2299819 100644 --- a/root/language/de/mods/info_acp_portal.php +++ b/root/language/de/mods/info_acp_portal.php @@ -86,8 +86,6 @@ $lang = array_merge($lang, array( 'PORTAL_RIGHT_COLUMN' => 'Rechte Spalte aktivieren', 'PORTAL_RIGHT_COLUMN_EXP' => 'Die Rechte Spalte auf dem Portal anzeigen', 'PORTAL_VERSION_CHECK' => 'Versioncheck auf Portal', - 'PORTAL_FORUM_INDEX' => 'Foren Index (Foren Liste)', - 'PORTAL_FORUM_INDEX_EXP' => 'Diesen Block auf dem Portal anzeigen.', 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS' => 'Breiteneinstellung der rechten und linken Spalte', 'PORTAL_LEFT_COLUMN_WIDTH' => 'Breite der linken Spalte', 'PORTAL_LEFT_COLUMN_WIDTH_EXP' => 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180', diff --git a/root/language/de/mods/portal/portal_birthday_list_module.php b/root/language/de/mods/portal/portal_birthday_list_module.php index 2f77e764..c0da3c63 100644 --- a/root/language/de/mods/portal/portal_birthday_list_module.php +++ b/root/language/de/mods/portal/portal_birthday_list_module.php @@ -39,7 +39,6 @@ $lang = array_merge($lang, array( 'ACP_PORTAL_BIRTHDAYS_SETTINGS' => 'Einstellungen für den Geburtstage-Block', 'ACP_PORTAL_BIRTHDAYS_SETTINGS_EXP' => 'Hier kannst du die Einstellungen für den Geburtstage-Block ändern.', 'PORTAL_BIRTHDAYS' => 'Geburtstage', - 'PORTAL_BIRTHDAYS_EXPLAIN' => 'Diesen Block auf dem Portal anzeigen.', 'PORTAL_BIRTHDAYS_AHEAD' => 'Anstehende Geburtstage', 'PORTAL_BIRTHDAYS_AHEAD_EXP' => 'Zeitraum für die Geburtstagsvorschau (Tage).
"0" deaktiviert die Anzeige der bevorstehenden Geburtstage.', )); diff --git a/root/language/de/mods/portal/portal_donation_module.php b/root/language/de/mods/portal/portal_donation_module.php index 712f384e..a27ed888 100644 --- a/root/language/de/mods/portal/portal_donation_module.php +++ b/root/language/de/mods/portal/portal_donation_module.php @@ -59,10 +59,6 @@ $lang = array_merge($lang, array( // ACP 'ACP_PORTAL_PAYPAL_SETTINGS' => 'Paypal Einstellungen', 'ACP_PORTAL_PAYPAL_SETTINGS_EXP' => 'Hier kannst du die Paypal Einstellungen ändern.', - 'PORTAL_PAY_C_BLOCK' => 'Normalen Paypal-Block anzeigen', - 'PORTAL_PAY_C_BLOCK_EXP' => 'Diesen Block auf dem Portal anzeigen.', - 'PORTAL_PAY_S_BLOCK' => 'Paypal als kleinen Block anzeigen', - 'PORTAL_PAY_S_BLOCK_EXP' => 'Diesen Block auf dem Portal anzeigen.', 'PORTAL_PAY_ACC' => 'Paypal Account', 'PORTAL_PAY_ACC_EXP' => 'Gib deine e-mail-Adresse an, die du bei Paypal benutzt, z.B. xxx@xxx.com', )); diff --git a/root/language/de/mods/portal/portal_topposters_module.php b/root/language/de/mods/portal/portal_topposters_module.php index c17248d6..5907cf85 100644 --- a/root/language/de/mods/portal/portal_topposters_module.php +++ b/root/language/de/mods/portal/portal_topposters_module.php @@ -34,5 +34,8 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'TOPPOSTERS' => 'Top Poster', 'TOPPOSTERS_CONFIG' => 'Einstellungen zu Top Poster', + + // ACP 'NUM_TOPPOSTERS' => 'Anzahl der Top Poster', + 'NUM_TOPPOSTERS_EXP' => 'Gebe die Anzahl der Benutzer an, die im Top Poster Block angezeigt werden sollen.', )); diff --git a/root/language/en/mods/portal/portal_attachments_module.php b/root/language/en/mods/portal/portal_attachments_module.php index dd847428..d4f97ded 100644 --- a/root/language/en/mods/portal/portal_attachments_module.php +++ b/root/language/en/mods/portal/portal_attachments_module.php @@ -39,7 +39,6 @@ $lang = array_merge($lang, array( // ACP 'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS' => 'Attachments settings', 'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS_EXP' => 'This is where you customize the attachments block.', - 'PORTAL_ATTACHMENTS_EXP' => 'Display this block on the portal.', 'PORTAL_ATTACHMENTS_NUMBER' => 'Limit of displayed attachments', 'PORTAL_ATTACHMENTS_NUMBER_EXP' => '0 means infinite', 'PORTAL_ATTACHMENTS_FORUM_IDS' => 'Attachments forums', diff --git a/root/language/en/mods/portal/portal_birthday_list_module.php b/root/language/en/mods/portal/portal_birthday_list_module.php index 5e636868..d38f86db 100644 --- a/root/language/en/mods/portal/portal_birthday_list_module.php +++ b/root/language/en/mods/portal/portal_birthday_list_module.php @@ -39,7 +39,6 @@ $lang = array_merge($lang, array( 'ACP_PORTAL_BIRTHDAYS_SETTINGS' => 'Birthdays Settings', 'ACP_PORTAL_BIRTHDAYS_SETTINGS_EXP' => 'This is where you customize the birthday block.', 'PORTAL_BIRTHDAYS' => 'Birthday block', - 'PORTAL_BIRTHDAYS_EXP' => 'Display this block on the portal.', 'PORTAL_BIRTHDAYS_AHEAD' => 'Birthdays ahead days', 'PORTAL_BIRTHDAYS_AHEAD_EXP' => 'How many days to look ahead for future birthdays.
"0" will disable the ahead birthdays list.', )); diff --git a/root/language/en/mods/portal/portal_donation_module.php b/root/language/en/mods/portal/portal_donation_module.php index 2ce065d7..53fb823b 100644 --- a/root/language/en/mods/portal/portal_donation_module.php +++ b/root/language/en/mods/portal/portal_donation_module.php @@ -58,11 +58,7 @@ $lang = array_merge($lang, array( // ACP 'ACP_PORTAL_PAYPAL_SETTINGS' => 'Paypal settings', - 'ACP_PORTAL_PAYPAL_SETTINGS_EXPLAIN' => 'This is where you customize the Paypal block.', - 'PORTAL_PAY_C_BLOCK' => 'Display paypal center block', - 'PORTAL_PAY_C_BLOCK_EXPLAIN' => 'Display this block on the portal.', - 'PORTAL_PAY_S_BLOCK' => 'Display paypal small block', - 'PORTAL_PAY_S_BLOCK_EXPLAIN' => 'Display this block on the portal.', + 'ACP_PORTAL_PAYPAL_SETTINGS_EXP' => 'This is where you customize the Paypal block.', 'PORTAL_PAY_ACC' => 'Paypal account to use', - 'PORTAL_PAY_ACC_EXPLAIN' => 'Enter your Paypal e-mail address eg. xxx@xxx.com', + 'PORTAL_PAY_ACC_EXP' => 'Enter your Paypal e-mail address eg. xxx@xxx.com', )); diff --git a/root/language/en/mods/portal/portal_news_module.php b/root/language/en/mods/portal/portal_news_module.php index 5b68e508..f40c8333 100644 --- a/root/language/en/mods/portal/portal_news_module.php +++ b/root/language/en/mods/portal/portal_news_module.php @@ -43,7 +43,6 @@ $lang = array_merge($lang, array( 'JUMP_NEWEST' => 'Jump to newest post', 'JUMP_FIRST' => 'Jump to first post', 'JUMP_TO_POST' => 'Jump to post', - 'BACK' => 'Back', // ACP 'ACP_PORTAL_NEWS_SETTINGS' => 'News settings', diff --git a/root/language/en/mods/portal/portal_poll_module.php b/root/language/en/mods/portal/portal_poll_module.php index de1795d8..64600616 100644 --- a/root/language/en/mods/portal/portal_poll_module.php +++ b/root/language/en/mods/portal/portal_poll_module.php @@ -41,8 +41,6 @@ $lang = array_merge($lang, array( // ACP 'ACP_PORTAL_POLLS_SETTINGS' => 'Poll settings', 'ACP_PORTAL_POLLS_SETTINGS_EXP' => 'This is where you customize the poll block.', - 'PORTAL_POLL_TOPIC' => 'Display poll blocks', - 'PORTAL_POLL_TOPIC_EXP' => 'Display this block on the portal.', 'PORTAL_POLL_TOPIC_ID' => 'Poll forum(s)', 'PORTAL_POLL_TOPIC_ID_EXP' => 'The forum(s) from which the polls should be displayed. If "Exclude forums" is set to "Yes", select the forums you want to exclude.
If "Exclude forums" is set to "No" select the forums you want to see.
Select/Deselect multiple forums by holding CTRL and clicking.', 'PORTAL_POLL_EXCLUDE_ID' => 'Exclude Forums',