From fd93ef970238d191a4c7da8da46c535888360ede Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Nov 2013 20:48:18 +0100 Subject: [PATCH] [move/language] Move language files out of mods folder use module folder The standard language files are now in language/%language%/ and the module language files have been moved to language/%language%/modules/. --- acp/portal_module.php | 10 +++++----- controller/main.php | 4 ++-- language/de/{mods => }/info_acp_portal.php | 0 .../portal => modules}/portal_announcements_module.php | 0 .../portal => modules}/portal_attachments_module.php | 0 .../portal => modules}/portal_birthday_list_module.php | 0 .../portal => modules}/portal_calendar_module.php | 0 .../{mods/portal => modules}/portal_clock_module.php | 0 .../{mods/portal => modules}/portal_custom_module.php | 0 .../portal => modules}/portal_donation_module.php | 0 .../portal => modules}/portal_forumlist_module.php | 0 .../{mods/portal => modules}/portal_friends_module.php | 0 .../portal => modules}/portal_latest_bots_module.php | 0 .../portal_latest_members_module.php | 0 .../{mods/portal => modules}/portal_leaders_module.php | 0 .../{mods/portal => modules}/portal_link_us_module.php | 0 .../{mods/portal => modules}/portal_links_module.php | 0 .../portal => modules}/portal_main_menu_module.php | 0 .../de/{mods/portal => modules}/portal_news_module.php | 0 .../de/{mods/portal => modules}/portal_poll_module.php | 0 .../portal => modules}/portal_random_member_module.php | 0 .../{mods/portal => modules}/portal_recent_module.php | 0 .../{mods/portal => modules}/portal_search_module.php | 0 .../portal => modules}/portal_statistics_module.php | 0 .../portal => modules}/portal_stylechanger_module.php | 0 .../portal => modules}/portal_topposters_module.php | 0 .../portal => modules}/portal_user_menu_module.php | 0 .../{mods/portal => modules}/portal_welcome_module.php | 0 .../portal => modules}/portal_whois_online_module.php | 0 language/de/{mods => }/portal.php | 0 language/en/{mods => }/info_acp_portal.php | 0 .../portal => modules}/portal_announcements_module.php | 0 .../portal => modules}/portal_attachments_module.php | 0 .../portal => modules}/portal_birthday_list_module.php | 0 .../portal => modules}/portal_calendar_module.php | 0 .../{mods/portal => modules}/portal_clock_module.php | 0 .../{mods/portal => modules}/portal_custom_module.php | 0 .../portal => modules}/portal_donation_module.php | 0 .../portal => modules}/portal_forumlist_module.php | 0 .../{mods/portal => modules}/portal_friends_module.php | 0 .../portal => modules}/portal_latest_bots_module.php | 0 .../portal_latest_members_module.php | 0 .../{mods/portal => modules}/portal_leaders_module.php | 0 .../{mods/portal => modules}/portal_link_us_module.php | 0 .../{mods/portal => modules}/portal_links_module.php | 0 .../portal => modules}/portal_main_menu_module.php | 0 .../en/{mods/portal => modules}/portal_news_module.php | 0 .../en/{mods/portal => modules}/portal_poll_module.php | 0 .../portal => modules}/portal_random_member_module.php | 0 .../{mods/portal => modules}/portal_recent_module.php | 0 .../{mods/portal => modules}/portal_search_module.php | 0 .../portal => modules}/portal_statistics_module.php | 0 .../portal => modules}/portal_stylechanger_module.php | 0 .../portal => modules}/portal_topposters_module.php | 0 .../portal => modules}/portal_user_menu_module.php | 0 .../{mods/portal => modules}/portal_welcome_module.php | 0 .../portal => modules}/portal_whois_online_module.php | 0 language/en/{mods => }/portal.php | 0 58 files changed, 7 insertions(+), 7 deletions(-) rename language/de/{mods => }/info_acp_portal.php (100%) rename language/de/{mods/portal => modules}/portal_announcements_module.php (100%) rename language/de/{mods/portal => modules}/portal_attachments_module.php (100%) rename language/de/{mods/portal => modules}/portal_birthday_list_module.php (100%) rename language/de/{mods/portal => modules}/portal_calendar_module.php (100%) rename language/de/{mods/portal => modules}/portal_clock_module.php (100%) rename language/de/{mods/portal => modules}/portal_custom_module.php (100%) rename language/de/{mods/portal => modules}/portal_donation_module.php (100%) rename language/de/{mods/portal => modules}/portal_forumlist_module.php (100%) rename language/de/{mods/portal => modules}/portal_friends_module.php (100%) rename language/de/{mods/portal => modules}/portal_latest_bots_module.php (100%) rename language/de/{mods/portal => modules}/portal_latest_members_module.php (100%) rename language/de/{mods/portal => modules}/portal_leaders_module.php (100%) rename language/de/{mods/portal => modules}/portal_link_us_module.php (100%) rename language/de/{mods/portal => modules}/portal_links_module.php (100%) rename language/de/{mods/portal => modules}/portal_main_menu_module.php (100%) rename language/de/{mods/portal => modules}/portal_news_module.php (100%) rename language/de/{mods/portal => modules}/portal_poll_module.php (100%) rename language/de/{mods/portal => modules}/portal_random_member_module.php (100%) rename language/de/{mods/portal => modules}/portal_recent_module.php (100%) rename language/de/{mods/portal => modules}/portal_search_module.php (100%) rename language/de/{mods/portal => modules}/portal_statistics_module.php (100%) rename language/de/{mods/portal => modules}/portal_stylechanger_module.php (100%) rename language/de/{mods/portal => modules}/portal_topposters_module.php (100%) rename language/de/{mods/portal => modules}/portal_user_menu_module.php (100%) rename language/de/{mods/portal => modules}/portal_welcome_module.php (100%) rename language/de/{mods/portal => modules}/portal_whois_online_module.php (100%) rename language/de/{mods => }/portal.php (100%) rename language/en/{mods => }/info_acp_portal.php (100%) rename language/en/{mods/portal => modules}/portal_announcements_module.php (100%) rename language/en/{mods/portal => modules}/portal_attachments_module.php (100%) rename language/en/{mods/portal => modules}/portal_birthday_list_module.php (100%) rename language/en/{mods/portal => modules}/portal_calendar_module.php (100%) rename language/en/{mods/portal => modules}/portal_clock_module.php (100%) rename language/en/{mods/portal => modules}/portal_custom_module.php (100%) rename language/en/{mods/portal => modules}/portal_donation_module.php (100%) rename language/en/{mods/portal => modules}/portal_forumlist_module.php (100%) rename language/en/{mods/portal => modules}/portal_friends_module.php (100%) rename language/en/{mods/portal => modules}/portal_latest_bots_module.php (100%) rename language/en/{mods/portal => modules}/portal_latest_members_module.php (100%) rename language/en/{mods/portal => modules}/portal_leaders_module.php (100%) rename language/en/{mods/portal => modules}/portal_link_us_module.php (100%) rename language/en/{mods/portal => modules}/portal_links_module.php (100%) rename language/en/{mods/portal => modules}/portal_main_menu_module.php (100%) rename language/en/{mods/portal => modules}/portal_news_module.php (100%) rename language/en/{mods/portal => modules}/portal_poll_module.php (100%) rename language/en/{mods/portal => modules}/portal_random_member_module.php (100%) rename language/en/{mods/portal => modules}/portal_recent_module.php (100%) rename language/en/{mods/portal => modules}/portal_search_module.php (100%) rename language/en/{mods/portal => modules}/portal_statistics_module.php (100%) rename language/en/{mods/portal => modules}/portal_stylechanger_module.php (100%) rename language/en/{mods/portal => modules}/portal_topposters_module.php (100%) rename language/en/{mods/portal => modules}/portal_user_menu_module.php (100%) rename language/en/{mods/portal => modules}/portal_welcome_module.php (100%) rename language/en/{mods/portal => modules}/portal_whois_online_module.php (100%) rename language/en/{mods => }/portal.php (100%) diff --git a/acp/portal_module.php b/acp/portal_module.php index 170f1136..c4160cf4 100644 --- a/acp/portal_module.php +++ b/acp/portal_module.php @@ -33,7 +33,7 @@ class portal_module global $db, $user, $cache, $template; global $config, $phpbb_root_path, $portal_root_path, $phpbb_admin_path, $phpbb_container, $phpEx; - $user->add_lang_ext('board3/portal', 'mods/portal'); + $user->add_lang_ext('board3/portal', 'portal'); $this->root_path = $phpbb_root_path . 'ext/board3/portal/'; @@ -132,7 +132,7 @@ class portal_module if ($this->c_class->get_language()) { - $this->user->add_lang_ext('board3/portal', 'mods/portal/' . $this->c_class->get_language()); + $this->user->add_lang_ext('board3/portal', 'modules/' . $this->c_class->get_language()); } $module_name = $this->user->lang[$this->c_class->get_name()]; $display_vars = $this->c_class->get_template_acp($module_id); @@ -549,7 +549,7 @@ class portal_module { if ($module->get_language()) { - $this->user->add_lang_ext('board3/portal', 'mods/portal/' . $module->get_language()); + $this->user->add_lang_ext('board3/portal', 'modules/' . $module->get_language()); } $fileinfo[] = array( 'module' => $module_class, @@ -596,7 +596,7 @@ class portal_module if ($this->c_class->get_language()) { - $this->user->add_lang_ext('board3/portal', 'mods/portal/' . $this->c_class->get_language()); + $this->user->add_lang_ext('board3/portal', 'modules/' . $this->c_class->get_language()); } $template_column = column_num_string($row['module_column']); @@ -1148,7 +1148,7 @@ class portal_module $this->c_class = $this->modules[$module_classname]; if ($this->c_class->get_language()) { - $this->user->add_lang_ext('board3/portal', 'mods/portal/' . $this->c_class->get_language()); + $this->user->add_lang_ext('board3/portal', 'modules/' . $this->c_class->get_language()); } $confirm_text = (isset($this->user->lang[$module_data['module_name']])) ? sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], $this->user->lang[$module_data['module_name']]) : sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], utf8_normalize_nfc($module_data['module_name'])); confirm_box(false, $confirm_text, build_hidden_fields(array( diff --git a/controller/main.php b/controller/main.php index 42b6ea74..0f35f4ba 100644 --- a/controller/main.php +++ b/controller/main.php @@ -143,7 +143,7 @@ class main // The following takes two arguments: // 1) which extension language folder we're using (it's not smart enough to use its own automatically) // 2) what language file to use - $this->user->add_lang_ext('board3/portal', 'mods/portal'); + $this->user->add_lang_ext('board3/portal', 'portal'); /** * get initial data @@ -209,7 +209,7 @@ class main if ($language_file = $module->get_language()) { - $this->user->add_lang_ext('board3/portal', 'mods/portal/' . $language_file); + $this->user->add_lang_ext('board3/portal', 'modules/' . $language_file); } if ($row['module_column'] == column_string_num('left') && $this->config['board3_left_column']) { diff --git a/language/de/mods/info_acp_portal.php b/language/de/info_acp_portal.php similarity index 100% rename from language/de/mods/info_acp_portal.php rename to language/de/info_acp_portal.php diff --git a/language/de/mods/portal/portal_announcements_module.php b/language/de/modules/portal_announcements_module.php similarity index 100% rename from language/de/mods/portal/portal_announcements_module.php rename to language/de/modules/portal_announcements_module.php diff --git a/language/de/mods/portal/portal_attachments_module.php b/language/de/modules/portal_attachments_module.php similarity index 100% rename from language/de/mods/portal/portal_attachments_module.php rename to language/de/modules/portal_attachments_module.php diff --git a/language/de/mods/portal/portal_birthday_list_module.php b/language/de/modules/portal_birthday_list_module.php similarity index 100% rename from language/de/mods/portal/portal_birthday_list_module.php rename to language/de/modules/portal_birthday_list_module.php diff --git a/language/de/mods/portal/portal_calendar_module.php b/language/de/modules/portal_calendar_module.php similarity index 100% rename from language/de/mods/portal/portal_calendar_module.php rename to language/de/modules/portal_calendar_module.php diff --git a/language/de/mods/portal/portal_clock_module.php b/language/de/modules/portal_clock_module.php similarity index 100% rename from language/de/mods/portal/portal_clock_module.php rename to language/de/modules/portal_clock_module.php diff --git a/language/de/mods/portal/portal_custom_module.php b/language/de/modules/portal_custom_module.php similarity index 100% rename from language/de/mods/portal/portal_custom_module.php rename to language/de/modules/portal_custom_module.php diff --git a/language/de/mods/portal/portal_donation_module.php b/language/de/modules/portal_donation_module.php similarity index 100% rename from language/de/mods/portal/portal_donation_module.php rename to language/de/modules/portal_donation_module.php diff --git a/language/de/mods/portal/portal_forumlist_module.php b/language/de/modules/portal_forumlist_module.php similarity index 100% rename from language/de/mods/portal/portal_forumlist_module.php rename to language/de/modules/portal_forumlist_module.php diff --git a/language/de/mods/portal/portal_friends_module.php b/language/de/modules/portal_friends_module.php similarity index 100% rename from language/de/mods/portal/portal_friends_module.php rename to language/de/modules/portal_friends_module.php diff --git a/language/de/mods/portal/portal_latest_bots_module.php b/language/de/modules/portal_latest_bots_module.php similarity index 100% rename from language/de/mods/portal/portal_latest_bots_module.php rename to language/de/modules/portal_latest_bots_module.php diff --git a/language/de/mods/portal/portal_latest_members_module.php b/language/de/modules/portal_latest_members_module.php similarity index 100% rename from language/de/mods/portal/portal_latest_members_module.php rename to language/de/modules/portal_latest_members_module.php diff --git a/language/de/mods/portal/portal_leaders_module.php b/language/de/modules/portal_leaders_module.php similarity index 100% rename from language/de/mods/portal/portal_leaders_module.php rename to language/de/modules/portal_leaders_module.php diff --git a/language/de/mods/portal/portal_link_us_module.php b/language/de/modules/portal_link_us_module.php similarity index 100% rename from language/de/mods/portal/portal_link_us_module.php rename to language/de/modules/portal_link_us_module.php diff --git a/language/de/mods/portal/portal_links_module.php b/language/de/modules/portal_links_module.php similarity index 100% rename from language/de/mods/portal/portal_links_module.php rename to language/de/modules/portal_links_module.php diff --git a/language/de/mods/portal/portal_main_menu_module.php b/language/de/modules/portal_main_menu_module.php similarity index 100% rename from language/de/mods/portal/portal_main_menu_module.php rename to language/de/modules/portal_main_menu_module.php diff --git a/language/de/mods/portal/portal_news_module.php b/language/de/modules/portal_news_module.php similarity index 100% rename from language/de/mods/portal/portal_news_module.php rename to language/de/modules/portal_news_module.php diff --git a/language/de/mods/portal/portal_poll_module.php b/language/de/modules/portal_poll_module.php similarity index 100% rename from language/de/mods/portal/portal_poll_module.php rename to language/de/modules/portal_poll_module.php diff --git a/language/de/mods/portal/portal_random_member_module.php b/language/de/modules/portal_random_member_module.php similarity index 100% rename from language/de/mods/portal/portal_random_member_module.php rename to language/de/modules/portal_random_member_module.php diff --git a/language/de/mods/portal/portal_recent_module.php b/language/de/modules/portal_recent_module.php similarity index 100% rename from language/de/mods/portal/portal_recent_module.php rename to language/de/modules/portal_recent_module.php diff --git a/language/de/mods/portal/portal_search_module.php b/language/de/modules/portal_search_module.php similarity index 100% rename from language/de/mods/portal/portal_search_module.php rename to language/de/modules/portal_search_module.php diff --git a/language/de/mods/portal/portal_statistics_module.php b/language/de/modules/portal_statistics_module.php similarity index 100% rename from language/de/mods/portal/portal_statistics_module.php rename to language/de/modules/portal_statistics_module.php diff --git a/language/de/mods/portal/portal_stylechanger_module.php b/language/de/modules/portal_stylechanger_module.php similarity index 100% rename from language/de/mods/portal/portal_stylechanger_module.php rename to language/de/modules/portal_stylechanger_module.php diff --git a/language/de/mods/portal/portal_topposters_module.php b/language/de/modules/portal_topposters_module.php similarity index 100% rename from language/de/mods/portal/portal_topposters_module.php rename to language/de/modules/portal_topposters_module.php diff --git a/language/de/mods/portal/portal_user_menu_module.php b/language/de/modules/portal_user_menu_module.php similarity index 100% rename from language/de/mods/portal/portal_user_menu_module.php rename to language/de/modules/portal_user_menu_module.php diff --git a/language/de/mods/portal/portal_welcome_module.php b/language/de/modules/portal_welcome_module.php similarity index 100% rename from language/de/mods/portal/portal_welcome_module.php rename to language/de/modules/portal_welcome_module.php diff --git a/language/de/mods/portal/portal_whois_online_module.php b/language/de/modules/portal_whois_online_module.php similarity index 100% rename from language/de/mods/portal/portal_whois_online_module.php rename to language/de/modules/portal_whois_online_module.php diff --git a/language/de/mods/portal.php b/language/de/portal.php similarity index 100% rename from language/de/mods/portal.php rename to language/de/portal.php diff --git a/language/en/mods/info_acp_portal.php b/language/en/info_acp_portal.php similarity index 100% rename from language/en/mods/info_acp_portal.php rename to language/en/info_acp_portal.php diff --git a/language/en/mods/portal/portal_announcements_module.php b/language/en/modules/portal_announcements_module.php similarity index 100% rename from language/en/mods/portal/portal_announcements_module.php rename to language/en/modules/portal_announcements_module.php diff --git a/language/en/mods/portal/portal_attachments_module.php b/language/en/modules/portal_attachments_module.php similarity index 100% rename from language/en/mods/portal/portal_attachments_module.php rename to language/en/modules/portal_attachments_module.php diff --git a/language/en/mods/portal/portal_birthday_list_module.php b/language/en/modules/portal_birthday_list_module.php similarity index 100% rename from language/en/mods/portal/portal_birthday_list_module.php rename to language/en/modules/portal_birthday_list_module.php diff --git a/language/en/mods/portal/portal_calendar_module.php b/language/en/modules/portal_calendar_module.php similarity index 100% rename from language/en/mods/portal/portal_calendar_module.php rename to language/en/modules/portal_calendar_module.php diff --git a/language/en/mods/portal/portal_clock_module.php b/language/en/modules/portal_clock_module.php similarity index 100% rename from language/en/mods/portal/portal_clock_module.php rename to language/en/modules/portal_clock_module.php diff --git a/language/en/mods/portal/portal_custom_module.php b/language/en/modules/portal_custom_module.php similarity index 100% rename from language/en/mods/portal/portal_custom_module.php rename to language/en/modules/portal_custom_module.php diff --git a/language/en/mods/portal/portal_donation_module.php b/language/en/modules/portal_donation_module.php similarity index 100% rename from language/en/mods/portal/portal_donation_module.php rename to language/en/modules/portal_donation_module.php diff --git a/language/en/mods/portal/portal_forumlist_module.php b/language/en/modules/portal_forumlist_module.php similarity index 100% rename from language/en/mods/portal/portal_forumlist_module.php rename to language/en/modules/portal_forumlist_module.php diff --git a/language/en/mods/portal/portal_friends_module.php b/language/en/modules/portal_friends_module.php similarity index 100% rename from language/en/mods/portal/portal_friends_module.php rename to language/en/modules/portal_friends_module.php diff --git a/language/en/mods/portal/portal_latest_bots_module.php b/language/en/modules/portal_latest_bots_module.php similarity index 100% rename from language/en/mods/portal/portal_latest_bots_module.php rename to language/en/modules/portal_latest_bots_module.php diff --git a/language/en/mods/portal/portal_latest_members_module.php b/language/en/modules/portal_latest_members_module.php similarity index 100% rename from language/en/mods/portal/portal_latest_members_module.php rename to language/en/modules/portal_latest_members_module.php diff --git a/language/en/mods/portal/portal_leaders_module.php b/language/en/modules/portal_leaders_module.php similarity index 100% rename from language/en/mods/portal/portal_leaders_module.php rename to language/en/modules/portal_leaders_module.php diff --git a/language/en/mods/portal/portal_link_us_module.php b/language/en/modules/portal_link_us_module.php similarity index 100% rename from language/en/mods/portal/portal_link_us_module.php rename to language/en/modules/portal_link_us_module.php diff --git a/language/en/mods/portal/portal_links_module.php b/language/en/modules/portal_links_module.php similarity index 100% rename from language/en/mods/portal/portal_links_module.php rename to language/en/modules/portal_links_module.php diff --git a/language/en/mods/portal/portal_main_menu_module.php b/language/en/modules/portal_main_menu_module.php similarity index 100% rename from language/en/mods/portal/portal_main_menu_module.php rename to language/en/modules/portal_main_menu_module.php diff --git a/language/en/mods/portal/portal_news_module.php b/language/en/modules/portal_news_module.php similarity index 100% rename from language/en/mods/portal/portal_news_module.php rename to language/en/modules/portal_news_module.php diff --git a/language/en/mods/portal/portal_poll_module.php b/language/en/modules/portal_poll_module.php similarity index 100% rename from language/en/mods/portal/portal_poll_module.php rename to language/en/modules/portal_poll_module.php diff --git a/language/en/mods/portal/portal_random_member_module.php b/language/en/modules/portal_random_member_module.php similarity index 100% rename from language/en/mods/portal/portal_random_member_module.php rename to language/en/modules/portal_random_member_module.php diff --git a/language/en/mods/portal/portal_recent_module.php b/language/en/modules/portal_recent_module.php similarity index 100% rename from language/en/mods/portal/portal_recent_module.php rename to language/en/modules/portal_recent_module.php diff --git a/language/en/mods/portal/portal_search_module.php b/language/en/modules/portal_search_module.php similarity index 100% rename from language/en/mods/portal/portal_search_module.php rename to language/en/modules/portal_search_module.php diff --git a/language/en/mods/portal/portal_statistics_module.php b/language/en/modules/portal_statistics_module.php similarity index 100% rename from language/en/mods/portal/portal_statistics_module.php rename to language/en/modules/portal_statistics_module.php diff --git a/language/en/mods/portal/portal_stylechanger_module.php b/language/en/modules/portal_stylechanger_module.php similarity index 100% rename from language/en/mods/portal/portal_stylechanger_module.php rename to language/en/modules/portal_stylechanger_module.php diff --git a/language/en/mods/portal/portal_topposters_module.php b/language/en/modules/portal_topposters_module.php similarity index 100% rename from language/en/mods/portal/portal_topposters_module.php rename to language/en/modules/portal_topposters_module.php diff --git a/language/en/mods/portal/portal_user_menu_module.php b/language/en/modules/portal_user_menu_module.php similarity index 100% rename from language/en/mods/portal/portal_user_menu_module.php rename to language/en/modules/portal_user_menu_module.php diff --git a/language/en/mods/portal/portal_welcome_module.php b/language/en/modules/portal_welcome_module.php similarity index 100% rename from language/en/mods/portal/portal_welcome_module.php rename to language/en/modules/portal_welcome_module.php diff --git a/language/en/mods/portal/portal_whois_online_module.php b/language/en/modules/portal_whois_online_module.php similarity index 100% rename from language/en/mods/portal/portal_whois_online_module.php rename to language/en/modules/portal_whois_online_module.php diff --git a/language/en/mods/portal.php b/language/en/portal.php similarity index 100% rename from language/en/mods/portal.php rename to language/en/portal.php