From 6e7e70a18abc4368bc0728db420d1f7f61ad8686 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 3 Aug 2012 11:43:23 -0500 Subject: [PATCH 1/7] [ticket/10780] Replace colon usage in template output with {L_COLON} Replace all the instances (I could find) where the colon is displayed to the user with {L_COLON} so it can be localised. PHPBB3-10780 --- phpBB/language/en/common.php | 1 + phpBB/styles/prosilver/template/bbcode.html | 4 +- .../prosilver/template/captcha_default.html | 2 +- .../styles/prosilver/template/captcha_qa.html | 2 +- .../prosilver/template/captcha_recaptcha.html | 2 +- .../template/custom_profile_fields.html | 6 +-- phpBB/styles/prosilver/template/drafts.html | 4 +- .../prosilver/template/forumlist_body.html | 4 +- .../styles/prosilver/template/index_body.html | 8 +-- phpBB/styles/prosilver/template/jumpbox.html | 4 +- .../styles/prosilver/template/login_body.html | 4 +- .../prosilver/template/login_forum.html | 2 +- .../prosilver/template/mcp_approve.html | 4 +- phpBB/styles/prosilver/template/mcp_ban.html | 18 +++---- .../styles/prosilver/template/mcp_forum.html | 4 +- .../styles/prosilver/template/mcp_front.html | 6 +-- phpBB/styles/prosilver/template/mcp_logs.html | 4 +- phpBB/styles/prosilver/template/mcp_move.html | 2 +- .../prosilver/template/mcp_notes_front.html | 2 +- .../prosilver/template/mcp_notes_user.html | 14 +++--- phpBB/styles/prosilver/template/mcp_post.html | 24 ++++----- .../styles/prosilver/template/mcp_queue.html | 8 +-- .../prosilver/template/mcp_reports.html | 6 +-- .../styles/prosilver/template/mcp_topic.html | 18 +++---- .../prosilver/template/mcp_warn_front.html | 2 +- .../prosilver/template/mcp_warn_list.html | 2 +- .../prosilver/template/mcp_warn_post.html | 10 ++-- .../prosilver/template/mcp_warn_user.html | 10 ++-- .../prosilver/template/memberlist_body.html | 26 +++++----- .../prosilver/template/memberlist_email.html | 12 ++--- .../prosilver/template/memberlist_im.html | 8 +-- .../prosilver/template/memberlist_search.html | 24 ++++----- .../prosilver/template/memberlist_view.html | 50 +++++++++---------- .../prosilver/template/overall_header.html | 4 +- .../template/posting_attach_body.html | 4 +- .../prosilver/template/posting_buttons.html | 4 +- .../prosilver/template/posting_editor.html | 24 ++++----- .../prosilver/template/posting_layout.html | 2 +- .../prosilver/template/posting_poll_body.html | 14 +++--- .../prosilver/template/posting_preview.html | 4 +- .../template/posting_topic_review.html | 2 +- .../prosilver/template/quickreply_editor.html | 2 +- .../prosilver/template/report_body.html | 6 +-- .../prosilver/template/search_body.html | 18 +++---- .../prosilver/template/search_results.html | 30 +++++------ .../prosilver/template/simple_header.html | 2 +- .../prosilver/template/timezone_option.html | 2 +- .../prosilver/template/ucp_agreement.html | 2 +- .../prosilver/template/ucp_attachments.html | 4 +- .../template/ucp_avatar_options.html | 12 ++--- .../prosilver/template/ucp_groups_manage.html | 14 +++--- .../template/ucp_groups_membership.html | 2 +- .../prosilver/template/ucp_main_drafts.html | 4 +- .../prosilver/template/ucp_main_front.html | 12 ++--- .../prosilver/template/ucp_pm_history.html | 4 +- .../template/ucp_pm_message_header.html | 8 +-- .../prosilver/template/ucp_pm_options.html | 24 ++++----- .../prosilver/template/ucp_pm_viewfolder.html | 10 ++-- .../template/ucp_pm_viewmessage.html | 22 ++++---- .../template/ucp_prefs_personal.html | 20 ++++---- .../prosilver/template/ucp_prefs_post.html | 8 +-- .../prosilver/template/ucp_prefs_view.html | 24 ++++----- .../template/ucp_profile_profile_info.html | 28 +++++------ .../template/ucp_profile_reg_details.html | 10 ++-- .../prosilver/template/ucp_register.html | 12 ++--- .../styles/prosilver/template/ucp_remind.html | 4 +- .../styles/prosilver/template/ucp_resend.html | 4 +- .../prosilver/template/ucp_zebra_foes.html | 4 +- .../prosilver/template/ucp_zebra_friends.html | 4 +- .../prosilver/template/viewforum_body.html | 16 +++--- .../prosilver/template/viewonline_body.html | 4 +- .../prosilver/template/viewtopic_body.html | 34 ++++++------- .../prosilver/template/viewtopic_print.html | 2 +- .../subsilver2/template/attachment.html | 2 +- phpBB/styles/subsilver2/template/bbcode.html | 8 +-- .../subsilver2/template/captcha_default.html | 2 +- .../subsilver2/template/captcha_qa.html | 2 +- .../template/captcha_recaptcha.html | 2 +- .../template/custom_profile_fields.html | 6 +-- .../subsilver2/template/forumlist_body.html | 8 +-- .../subsilver2/template/index_body.html | 4 +- phpBB/styles/subsilver2/template/jumpbox.html | 2 +- .../subsilver2/template/login_body.html | 4 +- .../subsilver2/template/login_forum.html | 2 +- .../subsilver2/template/mcp_approve.html | 4 +- phpBB/styles/subsilver2/template/mcp_ban.html | 18 +++---- .../styles/subsilver2/template/mcp_forum.html | 2 +- .../subsilver2/template/mcp_jumpbox.html | 2 +- .../styles/subsilver2/template/mcp_logs.html | 4 +- .../subsilver2/template/mcp_notes_front.html | 2 +- .../subsilver2/template/mcp_notes_user.html | 10 ++-- .../styles/subsilver2/template/mcp_post.html | 20 ++++---- .../styles/subsilver2/template/mcp_queue.html | 4 +- .../subsilver2/template/mcp_reports.html | 8 +-- .../styles/subsilver2/template/mcp_topic.html | 10 ++-- .../subsilver2/template/mcp_warn_front.html | 2 +- .../subsilver2/template/mcp_warn_list.html | 2 +- .../subsilver2/template/mcp_warn_user.html | 6 +-- .../subsilver2/template/memberlist_body.html | 4 +- .../subsilver2/template/memberlist_group.html | 4 +- .../subsilver2/template/memberlist_im.html | 4 +- .../template/memberlist_search.html | 28 +++++------ .../subsilver2/template/memberlist_view.html | 44 ++++++++-------- .../subsilver2/template/overall_header.html | 2 +- .../subsilver2/template/posting_body.html | 32 ++++++------ .../subsilver2/template/posting_buttons.html | 4 +- .../template/posting_poll_body.html | 12 ++--- .../subsilver2/template/posting_preview.html | 4 +- .../subsilver2/template/posting_review.html | 6 +-- .../template/posting_topic_review.html | 6 +-- .../template/quickreply_editor.html | 4 +- .../subsilver2/template/report_body.html | 6 +-- .../subsilver2/template/search_body.html | 18 +++---- .../subsilver2/template/search_results.html | 18 +++---- .../styles/subsilver2/template/searchbox.html | 2 +- .../subsilver2/template/timezone_option.html | 2 +- .../subsilver2/template/ucp_agreement.html | 2 +- .../subsilver2/template/ucp_attachments.html | 4 +- .../template/ucp_groups_manage.html | 28 +++++------ .../template/ucp_groups_membership.html | 2 +- .../subsilver2/template/ucp_header.html | 6 +-- .../template/ucp_main_bookmarks.html | 4 +- .../subsilver2/template/ucp_main_drafts.html | 8 +-- .../subsilver2/template/ucp_main_front.html | 10 ++-- .../template/ucp_main_subscribed.html | 4 +- .../subsilver2/template/ucp_pm_history.html | 4 +- .../template/ucp_pm_message_footer.html | 2 +- .../subsilver2/template/ucp_pm_options.html | 16 +++--- .../template/ucp_pm_viewfolder.html | 4 +- .../template/ucp_pm_viewmessage.html | 12 ++--- .../template/ucp_pm_viewmessage_print.html | 6 +-- .../template/ucp_prefs_personal.html | 20 ++++---- .../subsilver2/template/ucp_prefs_post.html | 8 +-- .../subsilver2/template/ucp_prefs_view.html | 24 ++++----- .../template/ucp_profile_avatar.html | 14 +++--- .../template/ucp_profile_profile_info.html | 24 ++++----- .../template/ucp_profile_reg_details.html | 10 ++-- .../subsilver2/template/ucp_register.html | 12 ++--- .../subsilver2/template/ucp_remind.html | 4 +- .../subsilver2/template/ucp_resend.html | 4 +- .../subsilver2/template/ucp_zebra_foes.html | 4 +- .../template/ucp_zebra_friends.html | 4 +- .../subsilver2/template/viewforum_body.html | 18 +++---- .../subsilver2/template/viewonline_body.html | 2 +- .../subsilver2/template/viewtopic_body.html | 28 +++++------ .../subsilver2/template/viewtopic_print.html | 6 +-- 146 files changed, 669 insertions(+), 668 deletions(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e6022e3b79..4300ef431a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -134,6 +134,7 @@ $lang = array_merge($lang, array( 'COLLAPSE_VIEW' => 'Collapse view', 'CLOSE_WINDOW' => 'Close window', 'COLOUR_SWATCH' => 'Colour swatch', + 'COLON' => ':', 'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic 'CONFIRM' => 'Confirm', 'CONFIRM_CODE' => 'Confirmation code', diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index dac2929a0f..c0c0a2da46 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -8,11 +8,11 @@
    • -
    {USERNAME} {L_WROTE}: +
    {USERNAME} {L_WROTE}{L_COLON}
    -
    {L_CODE}: {L_SELECT_ALL_CODE}
    +
    {L_CODE}{L_COLON} {L_SELECT_ALL_CODE}
    diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html index 007cff644f..c9c5295d13 100644 --- a/phpBB/styles/prosilver/template/captcha_default.html +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -9,7 +9,7 @@
    -
    +
    {L_CONFIRM_CODE}
    diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index 7986b1faa2..c179f6dc20 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -7,7 +7,7 @@
    -

    {L_CONFIRM_QUESTION_EXPLAIN}
    +

    {L_CONFIRM_QUESTION_EXPLAIN}
    diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index 087a5b9405..aad1008241 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -10,7 +10,7 @@
    -
    :
    {L_RECAPTCHA_EXPLAIN}
    +

    {L_RECAPTCHA_EXPLAIN}
    -
    -
    +
    +
    @@ -104,7 +104,7 @@
    -
    {L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
    +
    {L_OPTIONS}{L_COLON} {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
    diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index 0b1434f7e0..0f137f28df 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,4 +1,4 @@
    -

    {L_CAPTCHA_PREVIEW_EXPLAIN}
    +

    {L_CAPTCHA_PREVIEW_EXPLAIN}
    {L_PREVIEW}
    diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index e2804bbc7d..b333d9205c 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -14,32 +14,32 @@ {L_GENERAL_OPTIONS}
    -

    {L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
    +

    {L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
    -

    {L_CAPTCHA_GD_X_GRID_EXPLAIN}
    +

    {L_CAPTCHA_GD_X_GRID_EXPLAIN}
    -

    {L_CAPTCHA_GD_Y_GRID_EXPLAIN}
    +

    {L_CAPTCHA_GD_Y_GRID_EXPLAIN}
    -

    {L_CAPTCHA_GD_WAVE_EXPLAIN}
    +

    {L_CAPTCHA_GD_WAVE_EXPLAIN}
    -

    {L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
    +

    {L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
    -

    {L_CAPTCHA_GD_FONTS_EXPLAIN}
    +

    {L_CAPTCHA_GD_FONTS_EXPLAIN}
    diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 4eb46d2d3c..99f3f24f70 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -59,7 +59,7 @@
    {L_EDIT_QUESTION}
    -

    {L_QUESTION_STRICT_EXPLAIN}
    +

    {L_QUESTION_STRICT_EXPLAIN}
    diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 0ea2d6a024..79170e27c6 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,5 +1,5 @@
    -

    {L_CONFIRM_QUESTION_EXPLAIN}
    +

    {L_CONFIRM_QUESTION_EXPLAIN}
    diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 34912c7955..67176ebd07 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -13,11 +13,11 @@ {L_GENERAL_OPTIONS}
    -

    {L_RECAPTCHA_PUBLIC_EXPLAIN}
    +

    {L_RECAPTCHA_PUBLIC_EXPLAIN}
    -

    {L_RECAPTCHA_PRIVATE_EXPLAIN}
    +

    {L_RECAPTCHA_PRIVATE_EXPLAIN}
    diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 351397d3c7..982356bfa7 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -26,7 +26,7 @@ - {L_DAY}: - {L_MONTH}: - {L_YEAR}: + {L_DAY}{L_COLON} + {L_MONTH}{L_COLON} + {L_YEAR}{L_COLON} diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index cf78f30b50..5fec8c4789 100644 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -86,7 +86,7 @@
    -

    {checks.TITLE_EXPLAIN}
    +

    {checks.TITLE_EXPLAIN}
    {checks.RESULT}
    @@ -109,7 +109,7 @@
    -

    {options.TITLE_EXPLAIN}
    +

    {options.TITLE_EXPLAIN}
    {options.CONTENT}
    diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index e306d8f6bf..6826654ded 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -42,7 +42,7 @@ function dE(n, s, type)
    - + {S_LANG_SELECT}
    diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 79006fba69..1a809a3588 100644 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -20,7 +20,7 @@
    -
    {checks.TITLE}:
    {checks.TITLE_EXPLAIN}
    +
    {checks.TITLE}{L_COLON}
    {checks.TITLE_EXPLAIN}
    {checks.RESULT}
    @@ -43,7 +43,7 @@
    -

    {options.TITLE_EXPLAIN}
    +

    {options.TITLE_EXPLAIN}
    {options.CONTENT}
    diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 818889c89b..b5fa46dbf6 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -221,13 +221,13 @@
    {new.DIR_PART}
    {new.FILE_PART}     -
    {L_FILE_USED}: {new.CUSTOM_ORIGINAL} +
    {L_FILE_USED}{L_COLON} {new.CUSTOM_ORIGINAL}
    -
    +
    [{new.L_SHOW_DIFF}]{L_BINARY_FILE}
    -
    +
    @@ -245,11 +245,11 @@
    {not_modified.DIR_PART}
    {not_modified.FILE_PART}     -
    {L_FILE_USED}: {not_modified.CUSTOM_ORIGINAL} +
    {L_FILE_USED}{L_COLON} {not_modified.CUSTOM_ORIGINAL}
    -
    [{not_modified.L_SHOW_DIFF}]{L_BINARY_FILE}
    +
    [{not_modified.L_SHOW_DIFF}]{L_BINARY_FILE}
    -
    +
    @@ -266,24 +266,24 @@ {L_STATUS_MODIFIED}
    {modified.DIR_PART}
    {modified.FILE_PART}     -
    {L_FILE_USED}: {modified.CUSTOM_ORIGINAL} +
    {L_FILE_USED}{L_COLON} {modified.CUSTOM_ORIGINAL}
    -
     
    +
     
    -
    +
    -
    [{modified.L_SHOW_DIFF}]{L_BINARY_FILE}
    +
    [{modified.L_SHOW_DIFF}]{L_BINARY_FILE}
    -
    [{L_SHOW_DIFF_FINAL}] 
    +
    [{L_SHOW_DIFF_FINAL}] 
    -
    [{L_SHOW_DIFF_FINAL}] 
    +
    [{L_SHOW_DIFF_FINAL}] 
    @@ -299,13 +299,13 @@
    {new_conflict.DIR_PART}
    {new_conflict.FILE_PART}     -
    {L_FILE_USED}: {new_conflict.CUSTOM_ORIGINAL} +
    {L_FILE_USED}{L_COLON} {new_conflict.CUSTOM_ORIGINAL}
    -
    +
    [{new_conflict.L_SHOW_DIFF}]{L_BINARY_FILE}
    -
    +
    @@ -322,38 +322,38 @@ {L_STATUS_CONFLICT}
    {conflict.DIR_PART}
    {conflict.FILE_PART}     -
    {L_FILE_USED}: {conflict.CUSTOM_ORIGINAL} -
    {L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS} +
    {L_FILE_USED}{L_COLON} {conflict.CUSTOM_ORIGINAL} +
    {L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}
    -
    +
    [{L_DOWNLOAD_CONFLICTS}]
    {L_DOWNLOAD_CONFLICTS_EXPLAIN} {L_BINARY_FILE}
    -
    +
    -
     
    +
     
    -
    [{L_SHOW_DIFF_MODIFIED}]
    +
    [{L_SHOW_DIFF_MODIFIED}]
    -
    [{L_SHOW_DIFF_MODIFIED}]
    +
    [{L_SHOW_DIFF_MODIFIED}]
    -
    [{L_SHOW_DIFF_FINAL}]
    +
    [{L_SHOW_DIFF_FINAL}]
    -
    [{L_SHOW_DIFF_FINAL}]
    +
    [{L_SHOW_DIFF_FINAL}]
    @@ -392,7 +392,7 @@
    {L_SELECT_DOWNLOAD_FORMAT}
    -
    +
    {RADIO_BUTTONS}
    @@ -455,12 +455,12 @@
    {L_FTP_SETTINGS}
    -
    +
    {UPLOAD_METHOD}
    -

    {data.EXPLAIN}
    +

    {data.EXPLAIN}
    diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index b5d25e82f2..ecdc40e157 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -223,7 +223,7 @@ table.hrdiff caption span {

    {L_SKIP}

    - + @@ -231,7 +231,7 @@ table.hrdiff caption span { -
    {L_NUM_CONFLICTS}: {NUM_CONFLICTS}
    +
    {L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}

    diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index f6d0e1025f..f7902e6d2e 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -9,7 +9,7 @@