From 3f374a2cd777142c183a7890a9d45c26215471bb Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 12 Apr 2022 20:13:23 +0900 Subject: [PATCH] Update default db edit* language settings en = en_US jp = ja_JP --- 4dev/database/data/edit_tables.sql | 5 +++-- 4dev/database/table/edit_language.sql | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/4dev/database/data/edit_tables.sql b/4dev/database/data/edit_tables.sql index 2439fbf9..e79d7219 100755 --- a/4dev/database/data/edit_tables.sql +++ b/4dev/database/data/edit_tables.sql @@ -68,9 +68,10 @@ INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', 'B0C4B3 INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('User', '1E789E', 1); -- edit language +-- iso_name = encoding DELETE FROM edit_language; -INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('en', 'English', 'UTF-8', 1, 1, 1); -INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('ja', 'Japanese', 'UTF-8', 2, 1, 0); +INSERT INTO edit_language (long_name, short_name, iso_name, order_number, enabled, lang_default) VALUES ('English', 'en_US', 'UTF-8', 1, 1, 1); +INSERT INTO edit_language (long_name, short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('Japanese', 'ja_JP', 'UTF-8', 2, 1, 0); -- edit group DELETE FROM edit_group; diff --git a/4dev/database/table/edit_language.sql b/4dev/database/table/edit_language.sql index 0bf5239c..59415854 100644 --- a/4dev/database/table/edit_language.sql +++ b/4dev/database/table/edit_language.sql @@ -12,7 +12,7 @@ CREATE TABLE edit_language ( enabled SMALLINT NOT NULL DEFAULT 0, lang_default SMALLINT NOT NULL DEFAULT 0, long_name VARCHAR, - short_name VARCHAR, - iso_name VARCHAR, + short_name VARCHAR, -- en_US, en or en_US@latin without encoding + iso_name VARCHAR, -- should actually be encoding order_number INT ) INHERITS (edit_generic) WITHOUT OIDS;