Index: win_installer/updater/src/lams2.ini =================================================================== diff -u -r67a93bb3b6ddc7311ba644da2147223374d86258 -rb4ac0e78b6a2b05f8da85c5c759b7b71bc480213 --- win_installer/updater/src/lams2.ini (.../lams2.ini) (revision 67a93bb3b6ddc7311ba644da2147223374d86258) +++ win_installer/updater/src/lams2.ini (.../lams2.ini) (revision b4ac0e78b6a2b05f8da85c5c759b7b71bc480213) @@ -104,4 +104,4 @@ Right=290 Bottom=131 State=en_AU - English (Australia) -ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|hu_HU - Magyar|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)|ms_MY - Malay|ru_RU - Russian|ja_JP - Japanese +ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|hu_HU - Magyar|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)|ms_MY - Malay|ru_RU - Russian|ja_JP - Japanese|tr_TR - T�rk�e Index: win_installer/updater/src/sql/updateLocales.sql =================================================================== diff -u -r2ebcefc50ec75707b628398047da971c0bc80005 -rb4ac0e78b6a2b05f8da85c5c759b7b71bc480213 --- win_installer/updater/src/sql/updateLocales.sql (.../updateLocales.sql) (revision 2ebcefc50ec75707b628398047da971c0bc80005) +++ win_installer/updater/src/sql/updateLocales.sql (.../updateLocales.sql) (revision b4ac0e78b6a2b05f8da85c5c759b7b71bc480213) @@ -14,8 +14,9 @@ -- the combined column must be 'language_iso_code,country_iso_code' or 'language_iso_code'. It must match the value -- given by SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l -INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('ja','JP','日本語','LTR','ja,JP', 'ja'); -INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('ms', 'MY','Malay (Malaysia)','LTR','ms,MY', 'ms'); +--INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('ja','JP','日本語','LTR','ja,JP', 'ja'); +--INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('ms', 'MY','Malay (Malaysia)','LTR','ms,MY', 'ms'); +INSERT INTO locale_temp (language_iso_code, country_iso_code, description, direction, combined, fckeditor_code) VALUES ('tr', 'TR','Türkçe','LTR','tr,TR', 'tr'); INSERT INTO lams_supported_locale (language_iso_code, country_iso_code, description, direction, fckeditor_code) @@ -24,6 +25,3 @@ (SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l)); drop table if exists locale_temp; --- Fixing Japanese language string. See LDEV-1702 --- description description may be set to "Japanese (Japan)" -UPDATE lams_supported_locale SET description='日本語' WHERE language_iso_code='ja' AND country_iso_code='JP'; \ No newline at end of file