From 1b94cd3660cce326bea87f19b2e1933705e5e204 Mon Sep 17 00:00:00 2001 From: mystralkk Date: Fri, 24 Jan 2020 07:59:03 +0900 Subject: [PATCH] Partially fixed change set cd9a26c and updated the Japanese language file and doc --- .../admin/install/classes/installer.class.php | 4 +- .../language/chinese_simplified_utf-8.php | 19 ++++---- .../language/chinese_traditional_utf-8.php | 19 ++++---- .../admin/install/language/english.php | 19 ++++---- .../admin/install/language/english_utf-8.php | 19 ++++---- .../admin/install/language/german_utf-8.php | 17 +++---- .../admin/install/language/hebrew_utf-8.php | 14 +++--- .../admin/install/language/japanese_utf-8.php | 31 ++++++------- .../admin/install/language/polish_utf-8.php | 19 ++++---- public_html/docs/english/install.html | 14 +++--- public_html/docs/japanese/install.html | 44 +++++++++++++++++-- 11 files changed, 131 insertions(+), 88 deletions(-) diff --git a/public_html/admin/install/classes/installer.class.php b/public_html/admin/install/classes/installer.class.php index ccf2d3af7..6af5b46a6 100644 --- a/public_html/admin/install/classes/installer.class.php +++ b/public_html/admin/install/classes/installer.class.php @@ -53,13 +53,13 @@ class Installer 'iso-8859-1' => 'latin1', 'iso-8859-2' => 'latin2', 'iso-8859-15' => 'latin1', - 'utf-8' => 'utf-8', + 'utf-8' => 'utf8', ], 'pgsql' => [ // $LANG_CHARSET => $_DB_charset 'iso-8859-1' => 'LATIN1', 'iso-8859-2' => 'LATIN2', - 'iso-8859-15' => 'LATIN1', + 'iso-8859-15' => 'LATIN9', 'utf-8' => 'UTF8', ], ]; diff --git a/public_html/admin/install/language/chinese_simplified_utf-8.php b/public_html/admin/install/language/chinese_simplified_utf-8.php index fa4a33b2e..580fef88f 100644 --- a/public_html/admin/install/language/chinese_simplified_utf-8.php +++ b/public_html/admin/install/language/chinese_simplified_utf-8.php @@ -8,7 +8,7 @@ // | | // | Chinese language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | @@ -17,6 +17,7 @@ // | Randy Kolenko - randy AT nextide DOT ca | // | Matt West - matt AT mattdanger DOT net | // | Samuel Maung Stone - sam AT stonemicro DOT com | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -395,30 +396,30 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 ', - 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', + 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an existing file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', 'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.' ); diff --git a/public_html/admin/install/language/chinese_traditional_utf-8.php b/public_html/admin/install/language/chinese_traditional_utf-8.php index 661d39434..76906d96b 100644 --- a/public_html/admin/install/language/chinese_traditional_utf-8.php +++ b/public_html/admin/install/language/chinese_traditional_utf-8.php @@ -8,7 +8,7 @@ // | | // | Chinese language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | @@ -17,6 +17,7 @@ // | Randy Kolenko - randy AT nextide DOT ca | // | Matt West - matt AT mattdanger DOT net | // | Samuel Maung Stone - sam AT stonemicro DOT com | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -395,30 +396,30 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 ', - 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', + 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an existing file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', 'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.' ); diff --git a/public_html/admin/install/language/english.php b/public_html/admin/install/language/english.php index 8c0e2fb5f..83cbae642 100644 --- a/public_html/admin/install/language/english.php +++ b/public_html/admin/install/language/english.php @@ -8,7 +8,7 @@ // | | // | English language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | @@ -16,6 +16,7 @@ // | Dirk Haun - dirk AT haun-online DOT de | // | Randy Kolenko - randy AT nextide DOT ca | // | Matt West - matt AT mattdanger DOT net | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -400,30 +401,30 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 ', - 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', + 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an existing file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', 'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.' ); diff --git a/public_html/admin/install/language/english_utf-8.php b/public_html/admin/install/language/english_utf-8.php index 5e616c59d..37650252b 100644 --- a/public_html/admin/install/language/english_utf-8.php +++ b/public_html/admin/install/language/english_utf-8.php @@ -8,7 +8,7 @@ // | | // | English language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | @@ -16,6 +16,7 @@ // | Dirk Haun - dirk AT haun-online DOT de | // | Randy Kolenko - randy AT nextide DOT ca | // | Matt West - matt AT mattdanger DOT net | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -400,30 +401,30 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 ', - 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', + 'migrate_file' => 'Choose the backup file you want to migrate. This can either be an existing file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.', 'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.' ); diff --git a/public_html/admin/install/language/german_utf-8.php b/public_html/admin/install/language/german_utf-8.php index 07005a6fd..9c86ea1a0 100644 --- a/public_html/admin/install/language/german_utf-8.php +++ b/public_html/admin/install/language/german_utf-8.php @@ -8,7 +8,7 @@ // | | // | German language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | @@ -16,6 +16,7 @@ // | Dirk Haun - dirk AT haun-online DOT de | // | Randy Kolenko - randy AT nextide DOT ca | // | Matt West - matt AT mattdanger DOT net | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -394,25 +395,25 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 diff --git a/public_html/admin/install/language/hebrew_utf-8.php b/public_html/admin/install/language/hebrew_utf-8.php index dd838ef73..5e8301a90 100644 --- a/public_html/admin/install/language/hebrew_utf-8.php +++ b/public_html/admin/install/language/hebrew_utf-8.php @@ -389,25 +389,25 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 diff --git a/public_html/admin/install/language/japanese_utf-8.php b/public_html/admin/install/language/japanese_utf-8.php index b091011c0..414efb1ee 100644 --- a/public_html/admin/install/language/japanese_utf-8.php +++ b/public_html/admin/install/language/japanese_utf-8.php @@ -8,7 +8,7 @@ // | | // | Japanese language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | @@ -18,6 +18,7 @@ // | Matt West - matt AT mattdanger DOT net | // | Geeklog.jp group - info AT geeklog DOT jp | // | mystral-kk - geeklog AT mystral-kk DOT net | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -171,10 +172,10 @@ 117 => 'Cancel', 118 => '言語を選択する', 119 => 'Copyright © 2020 Geeklog', - 120 => '(Make sure your current database collation supports UTF-8. See Help for more information.)', - 121 => 'Home', - 122 => 'Help', - 123 => 'Character Sets and Database Collations' + 120 => '(データベースが照合順序がUTF-8をサポートしていることを確認してください。詳しくはこちらをご覧ください。)', + 121 => 'ホーム', + 122 => 'ヘルプ', + 123 => '文字セットとデータベースの照合順序' ); // +---------------------------------------------------------------------------+ @@ -385,36 +386,36 @@ 'site_admin_url' => 'AdminディレクトリのURLを入力します。', 'site_mail' => 'サイト管理者のEmailアドレスを入力します。', 'noreply_mail' => 'サイト管理者の No-Reply Email (返信を受け付けないEmailアドレス)を入力します。', - 'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site (unless your database collation is already UTF-8 then the UTF-8 character sets will be used automatically). Recommended for multi-lingual setups and required for emoji support.

This will set the database character set to UTF-8. If you have checked this setting, make sure your database collation is compatible with the character set (usually this is either utf8_general_ci or, if you wish to support emojis utf8mb4_general_ci). Checking this will not change the collation of your database, this must be done manually before you proceed with the install.

The Geeklog site English Language default character set is \'iso-8859-1\' (Latin-1) which is compatible with the database character set of \'latin1\' (latin1_swedish_ci). Changing the language of the install may change the character sets used. Some of these are older legacy encoding standards that supports a limited number of languages. If you leave \'Use UTF-8\' unchecked your installs default language selection character set will be used.', - 'charactersets' => 'Here are the Language character sets supported by the Geeklog Install along with their corresponding database character sets and recommended database collations: + 'utf8' => 'サイトの文字セットの既定値としてUTF-8を用いるかどうかを指定します(データベースでUTF-8が使用可能な場合は、自動的にUTF-8を使用します)。多言語サイトを構築する場合にUTF-8を推奨します。絵文字をサポートする場合はUTF-8は必須です。

チェックするとデータベースの文字セットをUTF-8に設定します。チェックする場合は、データベースの照合順序が文字セットと互換性があることを確認してください(普通、照合順序はutf8_general_ciか、絵文字をサポートしたい場合はutf8mb4_general_ci)です。ここをチェックしてもデータベースの照合順序が変わるわけではありません。インストールを行う前に手動で行う必要があります。

Geeklogのサイトの文字セットの既定値は \'iso-8859-1\' (Latin-1) で、データベースの文字セット \'latin1\' (latin1_swedish_ci) と互換性があります。インストールに使用する言語を変更すると、使用する文字セットも変わります。中には限られた数の言語しかサポートしていない伝統的な古い文字セットもあります。\'UTF-8を使用する\' のチェックをはずすと言語ごとの既定の文字セットを使用します。', + 'charactersets' => '以下に示すのは、Geeklogがインストール時にサポートする言語の文字セットと対応するデータベースの文字セット、推奨するデータベースの照合順序です:
- + - + - + - + - + - + - + - +
LanguageSite Language Character SetMySQL DB Character SetMySQL DB CollationPostgreSQL DB Character SetPostgreSQL DB Collation言語サイトの文字セットMySQLの文字セットMySQLの照合順序PostgreSQLの文字セットPostgreSQLの照合順序
Englishiso-8859-1latin1latin1_swedish_ciLATIN1英語iso-8859-1latin1latin1_swedish_ciLATIN1?
Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8日本語utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8
Germaniso-8859-15latin1latin1_swedish_ciLATIN1ドイツ語iso-8859-15latin1latin1_swedish_ciLATIN9?
Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8ヘブライ語utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8
Polishiso-8859-2latin2latin2_general_ciLATIN2ポーランド語iso-8859-2latin2latin2_general_ciLATIN2?
Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8中国語(簡体字)utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8
Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8中国語(繁体字)utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8
diff --git a/public_html/admin/install/language/polish_utf-8.php b/public_html/admin/install/language/polish_utf-8.php index 0b8c499ca..001bc17ad 100644 --- a/public_html/admin/install/language/polish_utf-8.php +++ b/public_html/admin/install/language/polish_utf-8.php @@ -8,14 +8,15 @@ // | | // | Polish language file for the Geeklog installation script | // +---------------------------------------------------------------------------+ -// | Copyright (C) 2000-2019 by the following authors: | +// | Copyright (C) 2000-2020 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | // | Mark Limburg - mlimburg AT users DOT sourceforge DOT net | // | Jason Whittenburg - jwhitten AT securitygeeks DOT com | // | Dirk Haun - dirk AT haun-online DOT de | -// | Randy Kolenko - randy AT nextide DOT ca +// | Randy Kolenko - randy AT nextide DOT ca | // | Matt West - matt AT mattdanger DOT net | +// | Tom Homer - tomhomer AT gmail DOT com | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -394,25 +395,25 @@ - Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 diff --git a/public_html/docs/english/install.html b/public_html/docs/english/install.html index 633a54e37..262b86da3 100644 --- a/public_html/docs/english/install.html +++ b/public_html/docs/english/install.html @@ -64,25 +64,25 @@

Required Software

- Englishiso-8859-1latin1latin1_swedish_ciLATIN1 + Englishiso-8859-1latin1latin1_swedish_ciLATIN1? - Japaneseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Japaneseutf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8 - Germaniso-8859-15latin1latin1_swedish_ciLATIN1 + Germaniso-8859-15latin1latin1_swedish_ciLATIN9? - Hebrewutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Hebrewutf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8 - Polishiso-8859-2latin2latin2_general_ciLATIN2 + Polishiso-8859-2latin2latin2_general_ciLATIN2? - Simplified Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Simplified Chineseutf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8 - Traditional Chineseutf-8utf-8utf8_general_ciUTF8en_US.UTF-8 + Traditional Chineseutf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8 diff --git a/public_html/docs/japanese/install.html b/public_html/docs/japanese/install.html index fbe4952c6..b80e0401f 100644 --- a/public_html/docs/japanese/install.html +++ b/public_html/docs/japanese/install.html @@ -56,12 +56,48 @@

必要なソフトウェア

また、データベースとして、MySQL 4.1.3以降か、(MariaDB 5.1以降も可), PostgreSQL 9.1.7以降が必要です。

+

データベースを作成するときに、どの照合順序を使用するかを理解してください。以下に示すのは、Geeklogがインストールでサポーストする言語の文字セットと対応するデータベース文字セット及び推奨する照合順序です:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
言語サイトの文字セットMySQLの文字セットMySQLの照合順序PostgreSQLの文字セットPostgreSQLの照合順序
英語iso-8859-1latin1latin1_swedish_ciLATIN1?
日本語utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8ja_JP.UTF-8
ドイツ語iso-8859-15latin1latin1_swedish_ciLATIN9?
ヘブライ語utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8he_IL.UTF-8
ポーランド語iso-8859-2latin2latin2_general_ciLATIN2?
中国語(簡体字)utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8zh_CN.UTF-8
中国語(繁体字)utf-8utf8/utf8mb4utf8_general_ci/utf8mb4_general_ciUTF8zh_TW.UTF-8
+ +

For multi language sites you generally want to use the database collation utf8_general_ci for MySQL or en_US.UTF-8 for PostgreSQL. These collations will be able to handle the character sets of different languages. If you set your database collations to one of these, your character sets will be updated automatically during the install.

+ +

During the install process you can indicate whether to use UTF-8 as the default character set for your site independent of the language you are using. This will set the database character set to UTF-8. If you have checked this setting, make sure your database collation is compatible with the character set (usually for MySQL this is either utf8_general_ci or, if you wish to support emojis utf8mb4_general_ci). Checking this will not change the collation of your database, this must be done manually before you proceed with the install. If you leave 'Use UTF-8' unchecked your installs default language selection character set will be used.

+ +

Geeklog supports other languages that are not listed in the install. The easiest way to support these languages is to use a UTF-8 database collation and then once the install is complete go into the Geeklog Configuration and change the language to the one you want. If you rather use the database collation specific for your language you will either have to pick an install language that uses the same character set, or after the install, manually update the settings in siteconfig.php and dbconfig.php files to use the correct character sets. You will then have to update your collation for the Geeklog database, tables and columns. To find out what character set the other languages use, you will need to check that actual language file located in the Geeklog languages directory.

+

PostgreSQLユーザーのための注意: 現在、GeeklogではPostgresオプション standard_conforming_strings を off に設定する必要があります(PostgreSQL 9.1以降はデフォルトで on になっています)。

-

MySQLユーザーのための注意: 多言語サイトでは、通常、データベースの照合順序に utf8_general_ci を使用します。 -この照合順序では異なる言語の文字セットを処理できます。MySQLのバージョン5.5.3では4バイト文字をサポートしています。 -例えば4バイトの絵文字アイコンの文字をサポートしたい場合は、utf8mb4_general_ci などの、それをサポートする照合順序を使用する必要があります。 -異なる照合順序を使用している既存のGeeklogのデータベースでは、phpMyAdminなどのツールを使用して、データベースのデフォルトやすべての照合順序を変更できます。当初の照合順序によっては、テーブルのデータを更新する必要があります。

+

MySQLユーザーのための注意:MySQLのバージョン5.5.3以降は4バイト文字をサポートしています。絵文字をサポートしたい場合は、utf8mb4_general_ci などの照合順序を使用する必要があります。既存のGeeklogのデータベースで異なる照合順序を使用している場合は、phpMyAdminなどのツールを使用して照合順序を変更します。変更する前の照合順序によっては、テーブルのデータを更新する必要があります。

必要な技術力