Skip to content

Commit

Permalink
Merge pull request macvim-dev#1397 from ychin/remove-locales-dup-enco…
Browse files Browse the repository at this point in the history 
…ding

Don't build/install non-UTF-8 and encoding-converted locales
  • Loading branch information
@ychin @tono
ychin authored and tono committed Mar 21, 2023
1 parent 061631d commit cb0bd91
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 88 deletions.
111 changes: 63 additions & 48 deletions src/po/Make_all.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ LANGUAGES = \
af \
ca \
cs \
cs.cp1250 \
da \
de \
en_GB \
Expand All @@ -17,40 +16,49 @@ LANGUAGES = \
ga \
it \
ja \
ja.euc-jp \
ja.sjis \
ko \
ko.UTF-8 \
lv \
nb \
nl \
no \
pl \
pl.UTF-8 \
pl.cp1250 \
pt_BR \
ru \
ru.cp1251 \
sk \
sk.cp1250 \
sr \
sv \
tr \
uk \
uk.cp1251 \
vi \
zh_CN \
zh_CN.UTF-8 \
zh_CN.cp936 \
zh_TW \
zh_TW.UTF-8 \

# MacVim: Don't bundle non-UTF-8 or encoding converted locale files as we always have iconv
#cs.cp1250 \
#ja.euc-jp \
#ja.sjis \
#ko \
#pl.cp1250 \
#pl.UTF-8 \
#ru.cp1251 \
#sk.cp1250 \
#uk.cp1251 \
#zh_CN \
#zh_CN.cp936 \
#zh_TW \

# MacVim: We removed the non-UTF-8 base locales for these, so we upgrade the
# <locale>.UTF-8 ones as base locales.
LANGUAGES_UTF8_ONLY = \
ko \
zh_CN \
zh_TW \

POFILES = \
af.po \
ca.po \
cs.po \
cs.cp1250.po \
da.po \
de.po \
en_GB.po \
Expand All @@ -61,34 +69,37 @@ POFILES = \
ga.po \
it.po \
ja.po \
ja.euc-jp.po \
ja.sjis.po \
ko.po \
ko.UTF-8.po \
lv.po \
nb.po \
nl.po \
no.po \
pl.po \
pl.UTF-8.po \
pl.cp1250.po \
pt_BR.po \
ru.po \
ru.cp1251.po \
sk.po \
sk.cp1250.po \
sr.po \
sv.po \
tr.po \
uk.po \
uk.cp1251.po \
vi.po \
zh_CN.po \
zh_CN.UTF-8.po \
zh_CN.cp936.po \
zh_TW.po \
zh_TW.UTF-8.po \

# MacVim: Don't bundle non-UTF-8 or encoding converted locale files as we always have iconv
#cs.cp1250.po \
#ja.euc-jp.po \
#ja.sjis.po \
#ko.po \
#pl.cp1250.po \
#pl.UTF-8.po \
#ru.cp1251.po \
#sk.cp1250.po \
#uk.cp1251.po \
#zh_CN.po \
#zh_CN.cp936.po \
#zh_TW.po \

MOFILES = \
af.mo \
Expand Down Expand Up @@ -123,25 +134,26 @@ MOFILES = \


MOCONVERTED = \
cs.cp1250.mo \
ja.euc-jp.mo \
ja.sjis.mo \
ko.mo \
pl.UTF-8.mo \
pl.cp1250.mo \
ru.cp1251.mo \
sk.cp1250.mo \
uk.cp1251.mo \
zh_CN.mo \
zh_CN.cp936.mo \
zh_TW.mo \

# MacVim: Don't bundle non-UTF-8 or encoding converted locale files as we always have iconv
#cs.cp1250.mo \
#ja.euc-jp.mo \
#ja.sjis.mo \
#ko.mo \
#pl.cp1250.mo \
#pl.UTF-8.mo \
#ru.cp1251.mo \
#sk.cp1250.mo \
#uk.cp1251.mo \
#zh_CN.mo \
#zh_CN.cp936.mo \
#zh_TW.mo \

CHECKFILES = \
af.ck \
ca.ck \
cs.ck \
cs.cp1250.ck \
da.ck \
de.ck \
en_GB.ck \
Expand All @@ -152,31 +164,34 @@ CHECKFILES = \
ga.ck \
it.ck \
ja.ck \
ja.euc-jp.ck \
ja.sjis.ck \
ko.UTF-8.ck \
ko.ck \
lv.ck \
nb.ck \
nl.ck \
no.ck \
pl.UTF-8.ck \
pl.ck \
pl.cp1250.ck \
pt_BR.ck \
ru.ck \
ru.cp1251.ck \
sk.ck \
sk.cp1250.ck \
sr.ck \
sv.ck \
tr.ck \
uk.ck \
uk.cp1251.ck \
vi.ck \
zh_CN.UTF-8.ck \
zh_CN.ck \
zh_CN.cp936.ck \
zh_TW.UTF-8.ck \
zh_TW.ck \

# MacVim: Don't bundle non-UTF-8 or encoding converted locale files as we always have iconv
#cs.cp1250.ck \
#ja.euc-jp.ck \
#ja.sjis.ck \
#ko.ck \
#pl.cp1250.ck \
#pl.UTF-8.ck \
#ru.cp1251.ck \
#sk.cp1250.ck \
#uk.cp1251.ck \
#zh_CN.ck \
#zh_CN.cp936.ck \
#zh_TW.ck \
10 changes: 10 additions & 0 deletions src/po/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ install: $(MOFILES) $(MOCONVERTED)
$(INSTALL_DATA) $$lang.mo $$dir/$(PACKAGE).mo; \
chmod $(FILEMOD) $$dir/$(PACKAGE).mo; \
fi; \
done; \
# MacVim: We remove non-UTF-8 locales as it does not make sense to ship \
# them on macOS. To make sure the base locales like "zh_TW" still works, we \
# move them from the encoding-specific ones like "zh_TW.UTF-8" to "zh_TW"
for lang_utf8_only in $(LANGUAGES_UTF8_ONLY); do \
dir=$(LOCALEDIR)/$$lang_utf8_only; \
if test -x "$$dir"; then \
rm -rf "$$dir"; \
fi; \
mv "$$dir.UTF-8" "$$dir"; \
done

uninstall:
Expand Down
8 changes: 0 additions & 8 deletions src/po/ja.euc-jp.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3503,10 +3503,6 @@ msgstr "with Photon GUI."
msgid "with GUI."
msgstr "with GUI."

# MacVim only
msgid "with MacVim GUI."
msgstr "with MacVim GUI."

msgid " Features included (+) or not (-):\n"
msgstr " 機能の一覧 有効(+)/無効(-)\n"

Expand Down Expand Up @@ -3588,10 +3584,6 @@ msgstr "
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "オンラインヘルプは :help<Enter> か <F1> "

# MacVim only
msgid "type :help macvim<Enter> for MacVim help "
msgstr "MacVim のオンラインヘルプは :help macvim<Enter> "

msgid "type :help version9<Enter> for version info"
msgstr "バージョン情報は :help version9<Enter> "

Expand Down
8 changes: 0 additions & 8 deletions src/po/ja.sjis.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3503,10 +3503,6 @@ msgstr "with Photon GUI."
msgid "with GUI."
msgstr "with GUI."

# MacVim only
msgid "with MacVim GUI."
msgstr "with MacVim GUI."

msgid " Features included (+) or not (-):\n"
msgstr " 機能\の一覧 有効(+)/無効(-)\n"

Expand Down Expand Up @@ -3588,10 +3584,6 @@ msgstr "
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "オンラインヘルプは :help<Enter> か <F1> "

# MacVim only
msgid "type :help macvim<Enter> for MacVim help "
msgstr "MacVim のオンラインヘルプは :help macvim<Enter> "

msgid "type :help version9<Enter> for version info"
msgstr "バージョン情報は :help version9<Enter> "

Expand Down
8 changes: 0 additions & 8 deletions src/po/zh_CN.cp936.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3474,10 +3474,6 @@ msgstr "
msgid "with GUI."
msgstr "带图形界面。"

# MacVim only
msgid "with MacVim GUI."
msgstr "带 MacVim 图形界面。"

msgid " Features included (+) or not (-):\n"
msgstr " 可使用(+)与不可使用(-)的功能:\n"

Expand Down Expand Up @@ -3559,10 +3555,6 @@ msgstr "
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "输入 :help<Enter> 或 <F1> 查看在线帮助 "

# MacVim only
msgid "type :help macvim<Enter> for MacVim help "
msgstr " 输入 :help macvim<Enter> 查看 MacVim 的在线帮助"

msgid "type :help version9<Enter> for version info"
msgstr "输入 :help version9<Enter> 查看版本信息 "

Expand Down
8 changes: 0 additions & 8 deletions src/po/zh_CN.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3474,10 +3474,6 @@ msgstr "
msgid "with GUI."
msgstr "带图形界面。"

# MacVim only
msgid "with MacVim GUI."
msgstr "带 MacVim 图形界面。"

msgid " Features included (+) or not (-):\n"
msgstr " 可使用(+)与不可使用(-)的功能:\n"

Expand Down Expand Up @@ -3559,10 +3555,6 @@ msgstr "
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "输入 :help<Enter> 或 <F1> 查看在线帮助 "

# MacVim only
msgid "type :help macvim<Enter> for MacVim help "
msgstr " 输入 :help macvim<Enter> 查看 MacVim 的在线帮助"

msgid "type :help version9<Enter> for version info"
msgstr "输入 :help version9<Enter> 查看版本信息 "

Expand Down
8 changes: 0 additions & 8 deletions src/po/zh_TW.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4714,10 +4714,6 @@ msgstr "
msgid "with Cocoa GUI."
msgstr "使用 Cocoa 圖型界面。"

# MacVim only
msgid "with MacVim GUI."
msgstr "使用 MacVim 圖型界面。"

msgid "with (classic) GUI."
msgstr "使用 (傳統) 圖型界面。"

Expand Down Expand Up @@ -4799,10 +4795,6 @@ msgstr "
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "線上說明請輸入 :help<Enter> "

# MacVim only
msgid "type :help macvim<Enter> for MacVim help "
msgstr "MacVim 線上說明請輸入 :help<Enter> "

msgid "type :help version9<Enter> for version info"
msgstr "新版本資訊請輸入 :help version9<Enter>"

Expand Down

0 comments on commit cb0bd91

Please sign in to comment.