changeset 27708:bb1a3e598a86 v8.2.4380

patch 8.2.4380: small differences between Chinese translation files Commit: https://github.com/vim/vim/commit/774e55702f236b0f16ef4a255a290dc87cfca67b Author: Ada <me@yuhaowen.com> Date: Mon Feb 14 15:04:55 2022 +0000 patch 8.2.4380: small differences between Chinese translation files Problem: Small differences between Chinese translation files. Solution: Add rule for converting UTF-8 to gb2312. (closes https://github.com/vim/vim/issues/9773)
author Bram Moolenaar <Bram@vim.org>
date Mon, 14 Feb 2022 16:15:03 +0100
parents 220d58c1748b
children 599a6afb81e5
files src/po/Make_all.mak src/po/Makefile src/version.c
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/po/Make_all.mak
+++ b/src/po/Make_all.mak
@@ -134,6 +134,7 @@ MOCONVERTED = \
 		ru.cp1251.mo \
 		sk.cp1250.mo \
 		uk.cp1251.mo \
+		zh_CN.mo \
 		zh_CN.cp936.mo \
 
 
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -132,6 +132,12 @@ sk.cp1250.po: sk.po
 	iconv -f iso-8859-2 -t cp1250 sk.po | \
 		sed -e 's/charset=ISO-8859-2/charset=cp1250/' -e 's/# Original translations/# Generated from sk.po, DO NOT EDIT/' > sk.cp1250.po
 
+# Convert zh_CN.UTF-8.po to create zh_CN.po.
+zh_CN.po: zh_CN.UTF-8.po
+	rm -f zh_CN.po
+	iconv -f UTF-8 -t gb2312 zh_CN.UTF-8.po | \
+		sed -e 's/charset=[uU][tT][fF]-8/charset=gb2312/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.po
+
 # Convert zh_CN.UTF-8.po to create zh_CN.cp936.po.
 # Set 'charset' to gbk to avoid that msfmt generates a warning.
 # This used to convert from zh_CN.po, but that results in a conversion error.
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4380,
+/**/
     4379,
 /**/
     4378,