From 330e2baf390465c3ed29ca5b7607b999361c833d Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 12 Apr 2022 14:25:19 +0900 Subject: [PATCH] Add new locale folder structure and symlinks for old lang layout --- 4dev/locale/Readme.md | 52 ++++++++++++++++++ .../en_US.admin.UTF-8.po} | 2 +- 4dev/locale/en_US.frontend.UTF-8.po | 2 + .../ja_JP.admin.UTF-8.po} | 2 +- 4dev/locale/ja_JP.frontend.UTF-8.po | 2 + www/includes/lang/admin/en_utf8.mo | Bin 704 -> 39 bytes www/includes/lang/admin/ja_utf8.mo | Bin 1128 -> 36 bytes www/includes/lang/frontend/en_utf8.mo | 1 + www/includes/lang/frontend/ja_utf8.mo | 1 + .../locale/en_US/LC_MESSAGES/admin.mo | Bin 0 -> 710 bytes .../locale/en_US/LC_MESSAGES/frontend.mo | Bin 0 -> 91 bytes www/includes/locale/ja/LC_MESSAGES/admin.mo | Bin 0 -> 1134 bytes .../locale/ja/LC_MESSAGES/frontend.mo | Bin 0 -> 91 bytes 13 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 4dev/locale/Readme.md rename 4dev/{lang/admin/messages_en_utf8.po => locale/en_US.admin.UTF-8.po} (97%) create mode 100644 4dev/locale/en_US.frontend.UTF-8.po rename 4dev/{lang/admin/messages_ja_utf8.po => locale/ja_JP.admin.UTF-8.po} (97%) create mode 100644 4dev/locale/ja_JP.frontend.UTF-8.po mode change 100644 => 120000 www/includes/lang/admin/en_utf8.mo mode change 100644 => 120000 www/includes/lang/admin/ja_utf8.mo create mode 120000 www/includes/lang/frontend/en_utf8.mo create mode 120000 www/includes/lang/frontend/ja_utf8.mo create mode 100644 www/includes/locale/en_US/LC_MESSAGES/admin.mo create mode 100644 www/includes/locale/en_US/LC_MESSAGES/frontend.mo create mode 100644 www/includes/locale/ja/LC_MESSAGES/admin.mo create mode 100644 www/includes/locale/ja/LC_MESSAGES/frontend.mo diff --git a/4dev/locale/Readme.md b/4dev/locale/Readme.md new file mode 100644 index 00000000..d6814fb7 --- /dev/null +++ b/4dev/locale/Readme.md @@ -0,0 +1,52 @@ +# Translation files + +## Source file name convetion + +Locale Name . Domain . Encoding .po + +## Name parte explenations + +### Locale Name Examples + +If underscore in name the long version is checked first, then the short version: +en_US@latin -> en_US -> en + +* en +* en_US +* en_US@latin + +### Domain + +For current case auto set CONTENT_PATH is used + +* admin +* frontend + +### Encoding + +if not set UTF-8 is assumed. Any other utf8 encoding is changed to UTF-8 + +* UTF-8 +* SJIS +* EUC + +## File name example source + +`ja_US.admin.UTF-8.po` + +## Folder layout + +`includes/locale/ja/LC_MESSAGES/frontend.mo` + +ALTERNATE LOCALE NAMES: +* ja +* ja_JP +* ja.UTF-8 +* ja_JP.UTF-8 + +ja_JP.UTF-8: Locale Name +frontend: dmain (CONTENT_PATH) + +## command + +`msgfmt -o www/includes/locale/ja_JP/LC_MESSAGES/frontend.UTF-8.mo 4dev/lang/ja_US.admin.UTF-8.po` diff --git a/4dev/lang/admin/messages_en_utf8.po b/4dev/locale/en_US.admin.UTF-8.po similarity index 97% rename from 4dev/lang/admin/messages_en_utf8.po rename to 4dev/locale/en_US.admin.UTF-8.po index 8f946d4d..e6241638 100644 --- a/4dev/lang/admin/messages_en_utf8.po +++ b/4dev/locale/en_US.admin.UTF-8.po @@ -26,7 +26,7 @@ msgid "Month" msgstr "Month" msgid "INPUT TEST" -msgstr "OUTPUT TEST EN" +msgstr "OUTPUT TEST ADMIN EN" msgid "I should be translated" msgstr "I should be translated: I WAS TRANSLATED" diff --git a/4dev/locale/en_US.frontend.UTF-8.po b/4dev/locale/en_US.frontend.UTF-8.po new file mode 100644 index 00000000..6e9f76f2 --- /dev/null +++ b/4dev/locale/en_US.frontend.UTF-8.po @@ -0,0 +1,2 @@ +msgid "INPUT TEST" +msgstr "OUTPUT TEST FRONTEND EN" diff --git a/4dev/lang/admin/messages_ja_utf8.po b/4dev/locale/ja_JP.admin.UTF-8.po similarity index 97% rename from 4dev/lang/admin/messages_ja_utf8.po rename to 4dev/locale/ja_JP.admin.UTF-8.po index b5ef1dfc..4d49c4a9 100644 --- a/4dev/lang/admin/messages_ja_utf8.po +++ b/4dev/locale/ja_JP.admin.UTF-8.po @@ -63,7 +63,7 @@ msgid "Sun" msgstr "日" msgid "INPUT TEST" -msgstr "OUTPUT TEST JA" +msgstr "OUTPUT TEST ADMIN JA" # login string msgid "Hello %s" diff --git a/4dev/locale/ja_JP.frontend.UTF-8.po b/4dev/locale/ja_JP.frontend.UTF-8.po new file mode 100644 index 00000000..91c739b2 --- /dev/null +++ b/4dev/locale/ja_JP.frontend.UTF-8.po @@ -0,0 +1,2 @@ +msgid "INPUT TEST" +msgstr "OUTPUT TEST FRONTEND JA" diff --git a/www/includes/lang/admin/en_utf8.mo b/www/includes/lang/admin/en_utf8.mo deleted file mode 100644 index 6b5280889c2daabcb43a599f7469f753c6f6e52c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmZ{h&x+JQ5XM_w6(V{VK|BbS2SLyt-HR+)|HYZ;MmEWi^eE%4H|b4!$#jSA9;5Hz zN$>$Y`3j1!;4^sf?#TzRGG-YCE%@;zMOAlIf8R!1?+M0P2}157BjhUnM<)rnfhtiipuR)x`#zvvME!``_kBUdmUZ;A z^l|35tm{t=-+e8X5)v2zod9RJvJH2ld`Kd&wO%zP9Q>IlQ8Jq|U}4Tktd*-tYGfr9 zZ=jQ|2J4Jel@Hgq$wF{LW=0>0!qKRt&xNs4D<6g&3<)n2tu~Ivwvr`%ys9i^+J~YM zOQG!87InvERqI1x9*L@LR<`TLg<^_=9NLFP7-Td~=`?`7)Q_W^FViIS z_PKSG4XbJ617=jU;+3FG@TCtSeVPTcy=aodB#q;F5={aYrAZFYc*_;slj=~9kJ`Vk zf8fPY9B#JS9^dgM_##5#Wp7%X#);SNcH3~NcA==bvBKS-vnOV~!6Iya;k&S&-!W0Sl)jowH-VAWR0!j^9F*YtuGv{Q@## Bxg7ui diff --git a/www/includes/lang/admin/en_utf8.mo b/www/includes/lang/admin/en_utf8.mo new file mode 120000 index 00000000..d3db0998 --- /dev/null +++ b/www/includes/lang/admin/en_utf8.mo @@ -0,0 +1 @@ +../../locale/en_US/LC_MESSAGES/admin.mo \ No newline at end of file diff --git a/www/includes/lang/admin/ja_utf8.mo b/www/includes/lang/admin/ja_utf8.mo deleted file mode 100644 index 39986a934ddb4a50a4854c3a186c0d5435e69682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1128 zcmY+C&ubG=5XVQYzvAyI;z8kw6cO3lUbMuYu}$rYo3zbFspw&wye3=H-LOB5y>(O3 z9`qn0MW_}jVnw8ay%YA#go-7{o&w zmVICgDBtUfhGLImR4S5f&C5K4mKhg zwscUjN%07{8Ga4i1)flTUC~hNQOqj#DP9L<-xi4S>NUtbGN+ueoTZ$D6gj_b(4Epy zf@5{rjaANZMbKtlWbTd7Ez2ftRg^u+ekkE_R^cr0EXOZd0neYM4r`b?J)63CspPUI zpSs-8Bc1t0H!S5@|LSPcQ{7pUnaPYvhV6s_C&P8521QD_l=kd`?N}vNv4bM>1J8B} zan{sI87rVn=#W_q$qYGN;d$!gmWRcsZqFU$xj@tN+GXzfw(G>1@-gLz_42ao1)AX( z?7Vh9Eclw~##ye!hq&W6`?+GpvI|9bfP3e7pUms{&za7L#jNBE~88P}oROiIVJrO++)w?2^ zS$y|)Y5I+bo{Q+wulY%;jX$FwckYu6h+c~5DPrVzu05(Q=a>_tPsHfF7`-j3Q*yH^ zS?$%7h{i>9YdIgKv*yYlz%C|eVeB^5CdTSo4?^4+HMNRpdZi2;o}`6| diff --git a/www/includes/lang/admin/ja_utf8.mo b/www/includes/lang/admin/ja_utf8.mo new file mode 120000 index 00000000..a4aff9e3 --- /dev/null +++ b/www/includes/lang/admin/ja_utf8.mo @@ -0,0 +1 @@ +../../locale/ja/LC_MESSAGES/admin.mo \ No newline at end of file diff --git a/www/includes/lang/frontend/en_utf8.mo b/www/includes/lang/frontend/en_utf8.mo new file mode 120000 index 00000000..0cc45273 --- /dev/null +++ b/www/includes/lang/frontend/en_utf8.mo @@ -0,0 +1 @@ +../../locale/en_US/LC_MESSAGES/frontend.mo \ No newline at end of file diff --git a/www/includes/lang/frontend/ja_utf8.mo b/www/includes/lang/frontend/ja_utf8.mo new file mode 120000 index 00000000..b5d54477 --- /dev/null +++ b/www/includes/lang/frontend/ja_utf8.mo @@ -0,0 +1 @@ +../../locale/ja/LC_MESSAGES/frontend.mo \ No newline at end of file diff --git a/www/includes/locale/en_US/LC_MESSAGES/admin.mo b/www/includes/locale/en_US/LC_MESSAGES/admin.mo new file mode 100644 index 0000000000000000000000000000000000000000..da820bb0fb59fb00c72177fd2b338eb80a635747 GIT binary patch literal 710 zcmZ{hzmC)}5XKE0AO+DZ2vHz06i7(mg=^3$$G@-}IHOClO1z+@^CiB-r>q^>UKZYg z3W;Z+qKA^6XP}{{;sKZ}ds>iSq@TWIG-J>B`!?8mPcY6RR}hYzL*62Nd_o4uXXFy{ z6$y~<$Z6yUavAxFY$4}Q5ONn8AXo99oh0N2szSYp`VO`4`+#}@^&@KE_XQPOR?*MW z$C=-kjP3{O7K=_*9tGIhlGJ^%%ZK};Lki^>14`*#|0;e(Y_&>RkhNh zg{AThIB%7%L%6<8W>Q!(vF1pYp0bKQm)0qxLs;ivod|N-8S81{YE{w4i`r3cLMU4~ zm)Z?o*(`;s8*?b_BUyLt!Y!A>(#(TNMsxW}^@q|i4jsZQj&ho0bR5B67AEZG%Pft9 zec?Ri>(z`60W-Q@h+0xE#XN+VKFy=a9vc-f%93Q7vQflYmKN|#bV9>Dr4P;UsQc^s z2SLJ;c(c{^@J=wo7m*q-d(+`GUcUCXyH+T@3uPm$lm7mcKcPFDx_&6!i^jS%)#~AP z4wMi6;Rnp5yVZLnti1Lgb3$P7A}WCAQCjRrJRXy5%8&hmXq>PV;&g4?@r%f6W!=WJ EU%7j_z5oCK literal 0 HcmV?d00001 diff --git a/www/includes/locale/en_US/LC_MESSAGES/frontend.mo b/www/includes/locale/en_US/LC_MESSAGES/frontend.mo new file mode 100644 index 0000000000000000000000000000000000000000..5e0a6ebdb27400b0eabb5f5a84edecaa81c6b567 GIT binary patch literal 91 zcmca7#4?ou2pEA_28dOFm>Gz5fS3!2Er3`Yh@F8L1VHLQz|$`vG(;i9H8_O9KQsi! SR&WdQ_X~0Lb5U^hV*mhrqYMiG literal 0 HcmV?d00001 diff --git a/www/includes/locale/ja/LC_MESSAGES/admin.mo b/www/includes/locale/ja/LC_MESSAGES/admin.mo new file mode 100644 index 0000000000000000000000000000000000000000..6d2ebed8540ff65970503500923db8af7fa23d7e GIT binary patch literal 1134 zcmY+C%WD%+6vmHljqfVrLg9jxE@WzpAQGRkP3?%2sm;VvAILPhos6V2VID?zPAatv zU5JPXRS^*@A{BH~EVy#vLeM`zL9UGof-5(!{BC+n>mld<=A4}Q?l~v<(z5&x!M4J8 zz-Qn);pdj%fPDm8z)#>Z@SEZfa5dsz;BxQ}xDEUZrohchiB^I;K>6M-a0S=~;zJsa z?O+Eeztn*@M)Pn$3Gbxd&--f9v6!WS|VM zHEjz{xyO0Km`#(~tKe(rLRzP|0hIGlCg7~bSrph_Sg|8sIzrv{73v9G>gAP+&ssz3 z_2Yna7MA_EQes1kt4YuG6)a|D^A;Jd7e|~7-;*AdDd&?JxQ^@D6;^YjG7F=?^_(|_!uGIOuGy|r_J?_JlsnZ*9M)>>MSmpKXKMZYk}E~EZVa4egV{{K zW|&%chV`0hL*ISI%w!^U04?PaM_hAx{3JZXiv3byWRm- zEZafIqeBI&N87(pC!4}tTGlK2rRGBS54ll_#MK+3J|#wTzoA6v^a#Gmv;lvlDaOG$tnL Td-9wbFJIH_^lNlBh1cjGjc6#Q literal 0 HcmV?d00001 diff --git a/www/includes/locale/ja/LC_MESSAGES/frontend.mo b/www/includes/locale/ja/LC_MESSAGES/frontend.mo new file mode 100644 index 0000000000000000000000000000000000000000..079717951feb70e13cbbc21e0b10bfd96b206845 GIT binary patch literal 91 zcmca7#4?ou2pEA_28dOFm>Gz5fS3!2Er3`Yh@F8L1VHLQz|$`vG(;i9H8_O9KQsi! SR&WdQ_X~0Lb5ZbeWB>qsm<$5| literal 0 HcmV?d00001