Removed 'UTF-8 Option'

Geeklog-Core · Apr 9, 2022 · 6b20d43 · 6b20d43
1 parent 84109f1
commit 6b20d43
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 31 deletions.
diff --git a/language/japanese_utf-8.php b/language/japanese_utf-8.php
@@ -2052,6 +2052,21 @@
     12 => '12月'
 );
 
+$LANG_MONTH_SHORT = array(
+    1 => ' 1月',
+    2 => ' 2月',
+    3 => ' 3月',
+    4 => ' 4月',
+    5 => ' 5月',
+    6 => ' 6月',
+    7 => ' 7月',
+    8 => ' 8月',
+    9 => ' 9月',
+    10 => '10月',
+    11 => '11月',
+    12 => '12月'
+);
+
 ###############################################################################
 # Weekdays
 
@@ -2065,6 +2080,30 @@
     7 => '土曜日'
 );
 
+$LANG_WEEK_SHORT = array(
+    1 => '日',
+    2 => '月',
+    3 => '火',
+    4 => '水',
+    5 => '木',
+    6 => '金',
+    7 => '土'
+);
+
+###############################################################################
+# AM/PM
+
+$LANG_AMPM = array(
+    'am_pm' => array(
+        'am' => 'am',
+        'pm' => 'pm',
+    ),
+    'AM_PM' => array(
+        'am' => 'AM',
+        'pm' => 'PM',
+    ),
+);
+
 ###############################################################################
 # Admin - Strings
 # 

diff --git a/public_html/admin/install/classes/Install.php b/public_html/admin/install/classes/Install.php
@@ -176,7 +176,7 @@ public function step2($retval, $req_string, $DB, $utf8, $params)
 
     public function step3($retval, $_DB_dbms, $installPlugins, $nextLink, $gl_path)
     {
-        global $_CONF, $_DEVICE, $_URL, $_TABLES;
+        global $_CONF, $_DEVICE, $_LOCALE, $_URL, $_TABLES;
         global $LANG01, $LANG03, $LANG04, $LANG05, $LANG08, $LANG09, $LANG10, $LANG11, $LANG12, $LANG20, $LANG21;
         global $LANG23, $LANG24, $LANG27, $LANG28, $LANG29, $LANG31, $LANG32, $LANG33, $MESSAGE;
 

diff --git a/public_html/admin/install/classes/installer.class.php b/public_html/admin/install/classes/installer.class.php
@@ -916,7 +916,7 @@ private function installEngine($installType, $installStep)
                 $site_admin_url = $this->post('site_admin_url');
                 $site_mail = $this->post('site_mail');
                 $noreply_mail = $this->post('noreply_mail');
-                $utf8 = ($this->post('utf8') === 'on');
+                $utf8 = ($installType === 'install') || ($this->post('utf8') === 'on');
                 $installPlugins = ($this->post('install_plugins') !== null);
                 $DB = [
                     'type'         => $this->post('db_type'),

diff --git a/public_html/admin/install/language/chinese_simplified_utf-8.php b/public_html/admin/install/language/chinese_simplified_utf-8.php
@@ -143,7 +143,6 @@
     89 => '目前版本:',
     90 => '空的数据库?',
     91 => '看来你的数据库是空的或你提供的数据库资料有错误. 或你想重新安装 (而不是升级)? 请回去再试.',
-    92 => '用 UTF-8',
     93 => 'Success',
     94 => 'Here are some hints to find the correct path:',
     95 => 'The complete path to this file (the install script) is:',
@@ -171,7 +170,6 @@
     117 => 'Cancel',
     118 => 'Change Language',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(Make sure your current database collation supports UTF-8. See <a href="help.php#charactersets">Help for more information</a>.)',
     121 => 'Home',
     122 => 'Help',
     123 => 'Character Sets and Database Collations'
@@ -499,7 +497,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
 	'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/language/chinese_traditional_utf-8.php b/public_html/admin/install/language/chinese_traditional_utf-8.php
@@ -143,7 +143,6 @@
     89 => '目前版本:',
     90 => '空的資料庫?',
     91 => '看來你的資料庫是空的或你提供的資料庫資料有錯誤. 或你想重新安裝 (而不是升級)? 請回去再試.',
-    92 => '用 UTF-8',
     93 => 'Success',
     94 => 'Here are some hints to find the correct path:',
     95 => 'The complete path to this file (the install script) is:',
@@ -171,7 +170,6 @@
     117 => 'Cancel',
     118 => 'Change Language',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(Make sure your current database collation supports UTF-8. See <a href="help.php#charactersets">Help for more information</a>.)',
     121 => 'Home',
     122 => 'Help',
     123 => 'Character Sets and Database Collations'
@@ -499,7 +497,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
 	'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/language/english.php b/public_html/admin/install/language/english.php
@@ -147,7 +147,6 @@
     89 => 'Current Version:',
     90 => 'Empty database?',
     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
-    92 => 'Use UTF-8',
     93 => 'SUCCESS',
     94 => 'Here are some hints to find the correct path:',
     95 => 'The complete path to this file (the install script) is:',
@@ -175,7 +174,6 @@
     117 => 'Cancel',
     118 => 'Change Language',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(Make sure your current database collation supports UTF-8. See <a href="help.php#charactersets">Help for more information</a>.)',
     121 => 'Home',
     122 => 'Help',
     123 => 'Character Sets and Database Collations'
@@ -449,7 +447,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
     'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/language/english_utf-8.php b/public_html/admin/install/language/english_utf-8.php
@@ -147,7 +147,6 @@
     89 => 'Current Version:',
     90 => 'Empty database?',
     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
-    92 => 'Use UTF-8',
     93 => 'SUCCESS',
     94 => 'Here are some hints to find the correct path:',
     95 => 'The complete path to this file (the install script) is:',
@@ -175,7 +174,6 @@
     117 => 'Cancel',
     118 => 'Change Language',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(Make sure your current database collation supports UTF-8. See <a href="help.php#charactersets">Help for more information</a>.)',
     121 => 'Home',
     122 => 'Help',
     123 => 'Character Sets and Database Collations'
@@ -449,7 +447,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
     'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/language/german_utf-8.php b/public_html/admin/install/language/german_utf-8.php
@@ -37,7 +37,7 @@
 
 // +---------------------------------------------------------------------------+
 
-$LANG_CHARSET = 'iso-8859-15';
+$LANG_CHARSET = 'utf-8';
 
 // +---------------------------------------------------------------------------+
 // | Array Format:                                                             |
@@ -142,7 +142,6 @@
     89 => 'Aktuelle Version:',
     90 => 'Leere Datenbank?',
     91 => 'Entweder ist die Datenbank leer oder die Zugangsdaten f&uuml;r die Datenbank sind nicht korrekt. Oder wolltest Du eigentlich eine Neuinstallation durchf&uuml;hren (statt eines Updates)? Bitte noch einmal probieren.',
-    92 => 'Benutze UTF-8',
     93 => 'Fertig',
     94 => 'Hier sind einige Hinweise, um den richtigen Pfad zu ermitteln:',
     95 => 'Der komplette Pfad zu dieser Datei (dem Installations-Skript) ist:',
@@ -170,7 +169,6 @@
     117 => 'Cancel',
     118 => 'Change Language',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(Make sure your current database collation supports UTF-8. See <a href="help.php#charactersets">Help for more information</a>.)',
     121 => 'Home',
     122 => 'Help',
     123 => 'Character Sets and Database Collations'
@@ -498,7 +496,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
 	'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/language/hebrew_utf-8.php b/public_html/admin/install/language/hebrew_utf-8.php
@@ -136,7 +136,6 @@
     89 => 'גירסה נוכחית:',
     90 => 'מאגר מידע ריק?',
     91 => 'נראה שמאגר המידע שלכם ריק או שהגדרות ההזדהות שציינתם בשבילו אינן נכונות. או שאולי התכוונתם לבצע התקנה חדשה (ולא שידרוג)? אנא חיזרו ונסו שוב.',
-    92 => 'שימוש ב-UTF-8',
     93 => 'הצלחה',
     94 => 'הנה כמה טיפים למצוא את הנתיב הנכון:',
     95 => 'הנתיב המלא לקובץ זה (סקריפט ההתקנה) הוא:',
@@ -164,7 +163,6 @@
     117 => 'Cancel',
     118 => 'Change Language',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(Make sure your current database collation supports UTF-8. See <a href="help.php#charactersets">Help for more information</a>.)',
     121 => 'Home',
     122 => 'Help',
     123 => 'Character Sets and Database Collations'
@@ -492,7 +490,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
 	'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/language/japanese_utf-8.php b/public_html/admin/install/language/japanese_utf-8.php
@@ -144,7 +144,6 @@
     89 => '現在のバージョン:',
     90 => 'データベースは空?',
     91 => 'データベースが空のままか、入力してデータベースの情報が不正確なようです。ひょっとすると、アップグレードではなく、新規インストールするつもりだったのではないでしょうか?　戻ってやり直してください。',
-    92 => 'UTF-8を使用する',
     93 => '成功',
     94 => 'パスのヒント:',
     95 => 'インストールスクリプトファイルへの完全なパスはこちらです:',
@@ -172,7 +171,6 @@
     117 => 'キャンセル',
     118 => '言語を選択する',
     119 => 'Copyright © 2020 <a href="https://www.geeklog.net/">Geeklog</a>',
-    120 => '(データベースがUTF-8の照合順序をサポートしていることを確認してください。<a href="help.php#charactersets">詳しくはこちら</a>をご覧ください。)',
     121 => 'ホーム',
     122 => 'ヘルプ',
     123 => '文字セットとデータベースの照合順序'
@@ -500,7 +498,6 @@
     'site_admin_url' => $LANG_INSTALL[47],
     'site_mail'      => $LANG_INSTALL[48],
     'noreply_mail'   => $LANG_INSTALL[49],
-    'utf8'           => $LANG_INSTALL[92],
 	'charactersets'  => $LANG_INSTALL[123],
     'migrate_file'   => $LANG_MIGRATE[6],
     'plugin_upload'  => $LANG_PLUGINS[10]

diff --git a/public_html/admin/install/layout/step1.thtml b/public_html/admin/install/layout/step1.thtml
@@ -81,12 +81,6 @@
         </div>
 
         {% if new_install %}
-        <div class="uk-margin">
-            <label class="uk-form-label" for="utf8">{{ LANG.INSTALL.92 }} {{ help_utf8 }}</label>
-            <div class="uk-form-controls uk-form-controls-text">
-                <input type="checkbox" id="utf8" name="utf8" {% if utf8 %} checked="checked" {% endif %} class="uk-checkbox"> <span>{{ LANG.INSTALL.120 }}</span>
-            </div>
-        </div>
         {% else %}
         <div class="uk-alert-warning" uk-alert>
             <p><span class="uk-label uk-label-warning">{{ LANG.INSTALL.59 }}</span> {{ LANG.INSTALL.116 }}</p>

diff --git a/public_html/admin/install/layout/step2-install.thtml b/public_html/admin/install/layout/step2-install.thtml
@@ -13,7 +13,6 @@
     <input type="hidden" name="site_admin_url" value="{! site_admin_url !}">
     <input type="hidden" name="site_mail" value="{! site_mail !}">
     <input type="hidden" name="noreply_mail" value="{! noreply_mail !}">
-    <input type="hidden" name="utf8" value="{{ utf8_string }}">
     <button type="submit" class="uk-button uk-button-primary uk-margin-small" value="{{ LANG.INSTALL.61 }}">{{ icon_arrow_prev }}&nbsp;&nbsp;{{ LANG.INSTALL.61 }}</button>
 </form>
 

diff --git a/system/build/lm/include/core.inc b/system/build/lm/include/core.inc
@@ -94,7 +94,10 @@ $ENGDI = $LANG_DIR;
 $ENGSEC = $LANG_SECTEST;
 $ENGWN = $LANG_WHATSNEW;
 $ENGMO = $LANG_MONTH;
+$ENGMO_SHORT = $LANG_MONTH_SHORT;
 $ENGWK = $LANG_WEEK;
+$ENGWK_SHORT = $LANG_WEEK_SHORT;
+$ENGAMPM = $LANG_AMPM;
 $ENGAD = $LANG_ADMIN;
 $ENG_LOGVIEW = $LANG_LOGVIEW;
 $ENG_ENVCHECK = $LANG_ENVCHECK;
@@ -213,7 +216,10 @@ mergeArrays($ENGDI,  $LANG_DIR, 'LANG_DIR', 'directory.php');
 mergeArrays($ENGSEC, $LANG_SECTEST, 'LANG_SECTEST', 'admin/sectest.php');
 mergeArrays($ENGWN,  $LANG_WHATSNEW, 'LANG_WHATSNEW', "\"What's New\" Time Strings\n\nThis here determines the order of the sentence \"No new articles in 2 hrs\"\norder it so it makes sense in your language:\n%i    item, \"Articles\"\n%n    amount, \"2\", \"20\" etc\n%t    time, \"2\" (weeks)\n%s    scale, \"hrs\", \"weeks\"");
 mergeArrays($ENGMO,  $LANG_MONTH, 'LANG_MONTH', 'Month names');
+mergeArrays($ENGMO_SHORT,  $LANG_MONTH_SHORT, 'LANG_MONTH_SHORT', 'Short Month names');
 mergeArrays($ENGWK,  $LANG_WEEK, 'LANG_WEEK', 'Weekdays');
+mergeArrays($ENGWK_SHORT,  $LANG_WEEK_SHORT, 'LANG_WEEK_SHORT', 'Short Weekday Names');
+mergeArrays($ENGAMPM,  $LANG_AMPM, 'LANG_AMPM', 'AM/PM');
 mergeArrays($ENGAD,  $LANG_ADMIN, 'LANG_ADMIN', "Admin - Strings\n\nThese are some standard strings used by core functions as well as plugins to\ndisplay administration lists and edit pages");
 
 echo "# Localisation of the texts for the various drop-down menus that are actually\n# stored in the database. If these exist, they override the texts from the\n# database.\n";