Skip to content

Commit

Permalink
Partially fixed change set cd9a26c and updated the Japanese language …
Browse files Browse the repository at this point in the history 
…file and doc
  • Loading branch information
@mystralkk
mystralkk committed Jan 23, 2020
1 parent cd9a26c commit 1b94cd3
Show file tree
Hide file tree
Showing 11 changed files with 131 additions and 88 deletions.
4 changes: 2 additions & 2 deletions public_html/admin/install/classes/installer.class.php
View file
Expand Up @@ -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',
],
];
Expand Down
19 changes: 10 additions & 9 deletions public_html/admin/install/language/chinese_simplified_utf-8.php
View file
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down Expand Up @@ -395,30 +396,30 @@
</thead>
<tbody>
<tr>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td>?</td>
</tr>
<tr>
<td>Japanese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Japanese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>ja_JP.UTF-8</td>
</tr>
<tr>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN9</td><td>?</td>
</tr>
<tr>
<td>Hebrew</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Hebrew</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>he_IL.UTF-8</td>
</tr>
<tr>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td></td>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td>?</td>
</tr>
<tr>
<td>Simplified Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Simplified Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_CN.UTF-8</td>
</tr>
<tr>
<td>Traditional Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Traditional Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_TW.UTF-8</td>
</tr>
</tbody>
</table>
</div>',
'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.'
);

Expand Down
19 changes: 10 additions & 9 deletions public_html/admin/install/language/chinese_traditional_utf-8.php
View file
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down Expand Up @@ -395,30 +396,30 @@
</thead>
<tbody>
<tr>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td>?</td>
</tr>
<tr>
<td>Japanese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Japanese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>ja_JP.UTF-8</td>
</tr>
<tr>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN9</td><td>?</td>
</tr>
<tr>
<td>Hebrew</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Hebrew</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>he_IL.UTF-8</td>
</tr>
<tr>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td></td>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td>?</td>
</tr>
<tr>
<td>Simplified Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Simplified Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_CN.UTF-8</td>
</tr>
<tr>
<td>Traditional Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Traditional Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_TW.UTF-8</td>
</tr>
</tbody>
</table>
</div>',
'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.'
);

Expand Down
19 changes: 10 additions & 9 deletions public_html/admin/install/language/english.php
View file
Expand Up @@ -8,14 +8,15 @@
// | |
// | 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 |
// | Jason Whittenburg - jwhitten AT securitygeeks DOT com |
// | 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 |
Expand Down Expand Up @@ -400,30 +401,30 @@
</thead>
<tbody>
<tr>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td>?</td>
</tr>
<tr>
<td>Japanese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Japanese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>ja_JP.UTF-8</td>
</tr>
<tr>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN9</td><td>?</td>
</tr>
<tr>
<td>Hebrew</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Hebrew</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>he_IL.UTF-8</td>
</tr>
<tr>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td></td>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td>?</td>
</tr>
<tr>
<td>Simplified Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Simplified Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_CN.UTF-8</td>
</tr>
<tr>
<td>Traditional Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Traditional Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_TW.UTF-8</td>
</tr>
</tbody>
</table>
</div>',
'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.'
);

Expand Down
19 changes: 10 additions & 9 deletions public_html/admin/install/language/english_utf-8.php
View file
Expand Up @@ -8,14 +8,15 @@
// | |
// | 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 |
// | Jason Whittenburg - jwhitten AT securitygeeks DOT com |
// | 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 |
Expand Down Expand Up @@ -400,30 +401,30 @@
</thead>
<tbody>
<tr>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td>?</td>
</tr>
<tr>
<td>Japanese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Japanese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>ja_JP.UTF-8</td>
</tr>
<tr>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN9</td><td>?</td>
</tr>
<tr>
<td>Hebrew</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Hebrew</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>he_IL.UTF-8</td>
</tr>
<tr>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td></td>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td>?</td>
</tr>
<tr>
<td>Simplified Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Simplified Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_CN.UTF-8</td>
</tr>
<tr>
<td>Traditional Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Traditional Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_TW.UTF-8</td>
</tr>
</tbody>
</table>
</div>',
'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.'
);

Expand Down
17 changes: 9 additions & 8 deletions public_html/admin/install/language/german_utf-8.php
View file
Expand Up @@ -8,14 +8,15 @@
// | |
// | 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 |
// | Jason Whittenburg - jwhitten AT securitygeeks DOT com |
// | 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 |
Expand Down Expand Up @@ -394,25 +395,25 @@
</thead>
<tbody>
<tr>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>English</td><td>iso-8859-1</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td>?</td>
</tr>
<tr>
<td>Japanese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Japanese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>ja_JP.UTF-8</td>
</tr>
<tr>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN1</td><td></td>
<td>German</td><td>iso-8859-15</td><td>latin1</td><td>latin1_swedish_ci</td><td>LATIN9</td><td>?</td>
</tr>
<tr>
<td>Hebrew</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Hebrew</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>he_IL.UTF-8</td>
</tr>
<tr>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td></td>
<td>Polish</td><td>iso-8859-2</td><td>latin2</td><td>latin2_general_ci</td><td>LATIN2</td><td>?</td>
</tr>
<tr>
<td>Simplified Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Simplified Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_CN.UTF-8</td>
</tr>
<tr>
<td>Traditional Chinese</td><td>utf-8</td><td>utf-8</td><td>utf8_general_ci</td><td>UTF8</td><td>en_US.UTF-8</td>
<td>Traditional Chinese</td><td>utf-8</td><td>utf8</td><td>utf8_general_ci/utf8mb4_general_ci</td><td>UTF8</td><td>zh_TW.UTF-8</td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 1b94cd3

Please sign in to comment.