From e87f740a9e7a048b7900d92ede04f405a337441c Mon Sep 17 00:00:00 2001 From: Jonathan Stanley Date: Sat, 7 Oct 2006 00:56:58 +0000 Subject: [PATCH] Explicitly setting the (X)HTML content-language for the ACP so that Unicode font matching within browsers work correctly when Chinese/Korean/Japanese language packs are selected due to Han Unification which map different graphemes to the same codepoint. References: http://www.w3.org/International/tutorials/tutorial-lang/ http://en.wikipedia.org/wiki/Han_unification git-svn-id: file:///svn/phpbb/trunk@6451 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 1 + phpBB/adm/style/colour_swatch.html | 4 +++- phpBB/adm/style/install_header.html | 3 ++- phpBB/adm/style/install_update_diff.html | 3 ++- phpBB/adm/style/overall_header.html | 3 ++- phpBB/adm/style/simple_header.html | 3 ++- phpBB/styles/subSilver/template/overall_header.html | 8 ++++---- phpBB/styles/subSilver/template/simple_header.html | 8 ++++---- .../subSilver/template/ucp_pm_viewmessage_print.html | 3 ++- phpBB/styles/subSilver/template/viewtopic_print.html | 3 ++- 10 files changed, 24 insertions(+), 15 deletions(-) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 8abf278edc..826df2f04b 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -147,6 +147,7 @@ function adm_page_header($page_title) 'ICON_SYNC' => '' . $user->lang['RESYNC'] . '', 'ICON_SYNC_DISABLED' => '' . $user->lang['RESYNC'] . '', + 'S_USER_LANG' => $user->data['user_lang'], 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => 'UTF-8', 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html index d4d28b6526..e7d7d03f14 100644 --- a/phpBB/adm/style/colour_swatch.html +++ b/phpBB/adm/style/colour_swatch.html @@ -1,7 +1,9 @@ - + + + {L_COLOUR_SWATCH} diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 7f1d002511..3b1d36776e 100755 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -1,9 +1,10 @@ - + + {META} {PAGE_TITLE} diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 293645788f..cdc0d8cc21 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -1,9 +1,10 @@ - + + {META} {PAGE_TITLE} diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 518ce835f2..0cdf9636e8 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -1,9 +1,10 @@ - + + {META} {PAGE_TITLE} diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 836c2b8a52..b234ad6456 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -1,9 +1,10 @@ - + + {META} {PAGE_TITLE} diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index ac0f359d5b..10b95c000d 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -1,16 +1,16 @@ - + + + + - - - {META} {SITENAME} • {PAGE_TITLE} diff --git a/phpBB/styles/subSilver/template/simple_header.html b/phpBB/styles/subSilver/template/simple_header.html index 18eba23de0..1d9691758c 100644 --- a/phpBB/styles/subSilver/template/simple_header.html +++ b/phpBB/styles/subSilver/template/simple_header.html @@ -1,16 +1,16 @@ - + + + + - - - {META} {SITENAME} • {PAGE_TITLE} diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html index da7f7a03f9..44edd2653b 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html @@ -1,8 +1,9 @@ - + + {SITENAME} :: {PAGE_TITLE}