Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 900) +++ trunk/CHANGELOG (revision 901) @@ -11,8 +11,10 @@ ! = Update/Change ------------------------------------- 2.8.0 ------------------------------------- +04-Jan-2009 Matthias Gallas +# made news Modul multilingual, see ticket #676 (some additional translations are needed) 03-Jan-2009 Matthias Gallas -# fixed bug in view.php of news module (ticket 676 Thanks to susigross) +# fixed bug in view.php of news module (ticket #676 Thanks to susigross) # fixed another bug in view.php of news modul introduced in changeset [892] 30-Dec-2008 Matthias Gallas + added default new language variables to all language files Index: trunk/wb/modules/news/comment_page.php =================================================================== --- trunk/wb/modules/news/comment_page.php (revision 900) +++ trunk/wb/modules/news/comment_page.php (revision 901) @@ -41,6 +41,15 @@ echo "\n\n"; } +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/news/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); +} + require_once(WB_PATH.'/include/captcha/captcha.php'); // Get comments page template details from db @@ -52,7 +61,9 @@ $settings = $query_settings->fetchRow(); // Print comments page - echo str_replace('[POST_TITLE]', POST_TITLE, ($settings['comments_page'])); + $vars = array('[POST_TITLE]','[TEXT_COMMENT]'); + $values = array(POST_TITLE, $MOD_NEWS['TEXT_COMMENT']); + echo str_replace($vars, $values, ($settings['comments_page'])); ?>
- +
+?> \ No newline at end of file Index: trunk/wb/modules/news/view.php =================================================================== --- trunk/wb/modules/news/view.php (revision 900) +++ trunk/wb/modules/news/view.php (revision 901) @@ -33,6 +33,15 @@ echo "\n\n"; } +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/news/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); +} + //overwrite php.ini on Apache servers for valid SESSION ID Separator if(function_exists('ini_set')) { ini_set('arg_separator.output', '&'); @@ -214,13 +223,13 @@ if($post_long_len < 9) { $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], ''); } else { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], $TEXT['READ_MORE']); + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email'], $MOD_NEWS['TEXT_READ_MORE']); } } else { if($post_long_len < 9) { $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', ''); } else { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', $TEXT['READ_MORE']); + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $short, $post_link, $post_date, $post_time, $publ_date, $publ_time, '', '', '', '', $MOD_NEWS['TEXT_READ_MORE']); } } echo str_replace($vars, $values, $setting_post_loop); @@ -291,13 +300,13 @@ $group_image = $groups[$group_id]['image']; if($group_image == '') { $display_image = 'none'; } else { $display_image = ''; } if($group_id == 0) { $display_group = 'none'; } else { $display_group = ''; } - $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[MODI_DATE]', '[MODI_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]'); + $vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[TEXT_BACK]', '[TEXT_LAST_CHANGED]', '[MODI_DATE]', '[TEXT_AT]', '[MODI_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[TEXT_POSTED_BY]', '[TEXT_ON]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]'); $post_short=$post['content_short']; $wb->preprocess($post_short); if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $post_date, $post_time, $publ_date, $publ_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']); + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']); } else { - $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $post_date, $post_time, $publ_date, $publ_time, '', '', '', ''); + $values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], '', '', '', ''); } $post_long = ($post['content_long']); } @@ -321,7 +330,9 @@ if(($post['commenting'] == 'private' AND isset($wb) AND $wb->is_authenticated() == true) OR $post['commenting'] == 'public') { // Print comments header - echo str_replace('[ADD_COMMENT_URL]', WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $setting_comments_header); + $vars = array('[ADD_COMMENT_URL]','[TEXT_COMMENTS]'); + $values = array(WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $MOD_NEWS['TEXT_COMMENTS']); + echo str_replace($vars, $values, $setting_comments_header); // Query for comments $query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".POST_ID."' ORDER BY commented_when ASC"); @@ -334,11 +345,11 @@ $commented_date = gmdate(DATE_FORMAT, $comment['commented_when']+TIMEZONE); $commented_time = gmdate(TIME_FORMAT, $comment['commented_when']+TIMEZONE); $uid = $comment['commented_by']; - $vars = array('[TITLE]','[COMMENT]','[DATE]','[TIME]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]'); + $vars = array('[TITLE]','[COMMENT]','[TEXT_ON]','[DATE]','[TEXT_AT]','[TIME]','[TEXT_BY]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]'); if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') { - $values = array(($comment['title']), ($comment['comment']), $commented_date, $commented_time, $uid, ($users[$uid]['username']), ($users[$uid]['display_name']), ($users[$uid]['email'])); + $values = array(($comment['title']), ($comment['comment']), $MOD_NEWS['TEXT_ON'], $commented_date, $MOD_NEWS['TEXT_AT'], $commented_time, $MOD_NEWS['TEXT_BY'], $uid, ($users[$uid]['username']), ($users[$uid]['display_name']), ($users[$uid]['email'])); } else { - $values = array(($comment['title']), ($comment['comment']), $commented_date, $commented_time, '0', strtolower($TEXT['UNKNOWN']), $TEXT['UNKNOWN'], ''); + $values = array(($comment['title']), ($comment['comment']), $MOD_NEWS['TEXT_ON'], $commented_date, $MOD_NEWS['TEXT_AT'], $commented_time, $MOD_NEWS['TEXT_BY'], '0', strtolower($TEXT['UNKNOWN']), $TEXT['UNKNOWN'], ''); } echo str_replace($vars, $values, $setting_comments_loop); } @@ -352,7 +363,9 @@ } // Print comments footer - echo str_replace('[ADD_COMMENT_URL]', WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $setting_comments_footer); + $vars = array('[ADD_COMMENT_URL]','[TEXT_ADD_COMMENT]'); + $values = array(WB_URL.'/modules/news/comment.php?id='.POST_ID.'&sid='.$section_id, $MOD_NEWS['TEXT_ADD_COMMENT']); + echo str_replace($vars, $values, $setting_comments_footer); } if(ENABLED_ASP) { $_SESSION['comes_from_view'] = POST_ID; Index: trunk/wb/modules/news/languages/NL.php =================================================================== --- trunk/wb/modules/news/languages/NL.php (revision 900) +++ trunk/wb/modules/news/languages/NL.php (revision 901) @@ -26,7 +26,19 @@ //Modul Description $module_description = 'Met deze module maak je een nieuwspagina.'; -//Variables for the backend +//Variables for the backend $MOD_NEWS['SETTINGS'] = 'Eigenschappen van de Nieuwsmodule'; +//Variables for the frontend +$MOD_NEWS['TEXT_READ_MORE'] = 'Lees verder'; +$MOD_NEWS['TEXT_POSTED_BY'] = 'Posted door'; +$MOD_NEWS['TEXT_ON'] = 'Op'; +$MOD_NEWS['TEXT_LAST_CHANGED'] = 'Laatst vernieuwd'; +$MOD_NEWS['TEXT_AT'] = 'at'; +$MOD_NEWS['TEXT_BACK'] = 'Terug'; +$MOD_NEWS['TEXT_COMMENTS'] = 'Commentaren'; +$MOD_NEWS['TEXT_COMMENT'] = 'Commentaar'; +$MOD_NEWS['TEXT_ADD_COMMENT'] = 'Toevoegen Commentaar'; +$MOD_NEWS['TEXT_BY'] = 'door'; + ?> \ No newline at end of file Index: trunk/wb/modules/news/languages/NO.php =================================================================== --- trunk/wb/modules/news/languages/NO.php (revision 900) +++ trunk/wb/modules/news/languages/NO.php (revision 901) @@ -26,7 +26,19 @@ //Modul Description $module_description = 'Denne sidetypen er ment for å kunne lage Nyhets sider.'; -//Variables for the backend +//Variables for the backend $MOD_NEWS['SETTINGS'] = 'Innstillinger for Nyheter'; + +//Variables for the frontend +$MOD_NEWS['TEXT_READ_MORE'] = 'Les Mer'; +$MOD_NEWS['TEXT_POSTED_BY'] = 'Posted Av'; +$MOD_NEWS['TEXT_ON'] = 'På'; +$MOD_NEWS['TEXT_LAST_CHANGED'] = 'Sist Endret'; +$MOD_NEWS['TEXT_AT'] = 'at'; +$MOD_NEWS['TEXT_BACK'] = 'Tilbake'; +$MOD_NEWS['TEXT_COMMENTS'] = 'Kommentarer'; +$MOD_NEWS['TEXT_COMMENT'] = 'Kommentar'; +$MOD_NEWS['TEXT_ADD_COMMENT'] = 'Legg Til Kommentar'; +$MOD_NEWS['TEXT_BY'] = 'Av'; ?> \ No newline at end of file Index: trunk/wb/modules/news/languages/EN.php =================================================================== --- trunk/wb/modules/news/languages/EN.php (revision 900) +++ trunk/wb/modules/news/languages/EN.php (revision 901) @@ -26,7 +26,19 @@ //Modul Description $module_description = 'This page type is designed for making a news page.'; -//Variables for the backend +//Variables for the backend $MOD_NEWS['SETTINGS'] = 'News Settings'; +//Variables for the frontend +$MOD_NEWS['TEXT_READ_MORE'] = 'Read More'; +$MOD_NEWS['TEXT_POSTED_BY'] = 'Posted by'; +$MOD_NEWS['TEXT_ON'] = 'on'; +$MOD_NEWS['TEXT_LAST_CHANGED'] = 'Last changed'; +$MOD_NEWS['TEXT_AT'] = 'at'; +$MOD_NEWS['TEXT_BACK'] = 'Back'; +$MOD_NEWS['TEXT_COMMENTS'] = 'Comments'; +$MOD_NEWS['TEXT_COMMENT'] = 'Comment'; +$MOD_NEWS['TEXT_ADD_COMMENT'] = 'Add Comment'; +$MOD_NEWS['TEXT_BY'] = 'By'; + ?> \ No newline at end of file Index: trunk/wb/modules/news/languages/RU.php =================================================================== --- trunk/wb/modules/news/languages/RU.php (revision 900) +++ trunk/wb/modules/news/languages/RU.php (revision 901) @@ -26,7 +26,19 @@ //Modul Description $module_description = 'Модуль предназначен для создания ленты новостей'; -//Variables for the backend +//Variables for the backend $MOD_NEWS['SETTINGS'] = 'Настройки новостной ленты'; -?> +//Variables for the frontend +$MOD_NEWS['TEXT_READ_MORE'] = 'Читать дальше'; +$MOD_NEWS['TEXT_POSTED_BY'] = 'Posted by'; +$MOD_NEWS['TEXT_ON'] = 'on'; +$MOD_NEWS['TEXT_LAST_CHANGED'] = 'Последнее обновление'; +$MOD_NEWS['TEXT_AT'] = 'at'; +$MOD_NEWS['TEXT_BACK'] = 'Назад'; +$MOD_NEWS['TEXT_COMMENTS'] = 'Комментарии'; +$MOD_NEWS['TEXT_COMMENT'] = 'Комментировать'; +$MOD_NEWS['TEXT_ADD_COMMENT'] = 'Добавить Комментировать'; +$MOD_NEWS['TEXT_BY'] = 'By'; + +?> \ No newline at end of file Index: trunk/wb/modules/news/languages/DE.php =================================================================== --- trunk/wb/modules/news/languages/DE.php (revision 900) +++ trunk/wb/modules/news/languages/DE.php (revision 901) @@ -23,10 +23,22 @@ */ -//Modulbeschreibung +//Modul Description $module_description = 'Mit diesem Modul können sie eine News Seite ihrer Seite hinzufügen.'; -//Variablen fuer backend Texte +//Variables for the backend $MOD_NEWS['SETTINGS'] = 'News Einstellungen'; +//Variables for the frontend +$MOD_NEWS['TEXT_READ_MORE'] = 'Weiterlesen'; +$MOD_NEWS['TEXT_POSTED_BY'] = 'Veröffentlicht von'; +$MOD_NEWS['TEXT_ON'] = 'am'; +$MOD_NEWS['TEXT_LAST_CHANGED'] = 'Zuletzt geändert am'; +$MOD_NEWS['TEXT_AT'] = 'um'; +$MOD_NEWS['TEXT_BACK'] = 'Zurück'; +$MOD_NEWS['TEXT_COMMENTS'] = 'Kommentare'; +$MOD_NEWS['TEXT_COMMENT'] = 'Kommentar'; +$MOD_NEWS['TEXT_ADD_COMMENT'] = 'Kommentar hinzufügen'; +$MOD_NEWS['TEXT_BY'] = 'von'; + ?> \ No newline at end of file Index: trunk/wb/modules/news/add.php =================================================================== --- trunk/wb/modules/news/add.php (revision 900) +++ trunk/wb/modules/news/add.php (revision 901) @@ -51,27 +51,27 @@ [GROUP_TITLE] -Posted by [DISPLAY_NAME] ([USERNAME]) on [PUBLISHED_DATE] +[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE] [PAGE_TITLE] >> [GROUP_TITLE] '); -$post_footer = '

Last changed: [MODI_DATE] at [MODI_TIME]

-Back'; +$post_footer = '

[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]

+[TEXT_BACK]'; $comments_header = addslashes('

-

Comments

+

[TEXT_COMMENTS]

'); $comments_loop = addslashes(' - +'); $comments_footer = '
[TITLE]By [DISPLAY_NAME] on [DATE] at [TIME][TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]
[COMMENT]
-
Add Comment'; -$comments_page = '

Comment

+
[TEXT_ADD_COMMENT]'; +$comments_page = '

[TEXT_COMMENT]

[POST_TITLE]


'; $commenting = 'none';