Merge "Fix accidential variable overriding in manualWordsTable"

diff --combined maintenance/language/zhtable/Makefile.py
index 15a1cb9,c88b095..abe08e4
--- 1/maintenance/language/zhtable/Makefile.py
--- 2/maintenance/language/zhtable/Makefile.py
+++ b/maintenance/language/zhtable/Makefile.py
@@@ -248,7 -248,8 +248,8 @@@ def translate(text, conv_table)
  
  def manualWordsTable(path, conv_table, reconv_table):
      fp = open(path, 'r', encoding='U8')
-     reconv_table = {}
+     reconv_table = reconv_table.copy()
+     out_table = {}
      wordlist = [line.split('#')[0].strip() for line in fp]
      wordlist = list(set(wordlist))
      wordlist.sort(key=lambda w: (len(w), w), reverse=True)
@@@ -257,9 -258,9 +258,9 @@@
          new_word = translate(word, conv_table)
          rcv_word = translate(word, reconv_table)
          if word != rcv_word:
-             reconv_table[word] = word
-         reconv_table[new_word] = word
-     return reconv_table
+             reconv_table[word] = out_table[word] = word
+         reconv_table[new_word] = out_table[new_word] = word
+     return out_table
  
  
  def defaultWordsTable(src_wordlist, src_tomany, char_conv_table,
@@@ -417,17 -418,17 +418,17 @@@ def main()
  namespace MediaWiki\Languages\Data;
  
  class ZhConversion {
 -public static $zh2Hant = array(\n'''
 +public static $zh2Hant = [\n'''
      php += PHPArray(toHant) \
 -        + '\n);\n\npublic static $zh2Hans = array(\n' \
 +        + '\n];\n\npublic static $zh2Hans = [\n' \
          + PHPArray(toHans) \
 -        + '\n);\n\npublic static $zh2TW = array(\n' \
 +        + '\n];\n\npublic static $zh2TW = [\n' \
          + PHPArray(toTW) \
 -        + '\n);\n\npublic static $zh2HK = array(\n' \
 +        + '\n];\n\npublic static $zh2HK = [\n' \
          + PHPArray(toHK) \
 -        + '\n);\n\npublic static $zh2CN = array(\n' \
 +        + '\n];\n\npublic static $zh2CN = [\n' \
          + PHPArray(toCN) \
 -        + '\n);\n}\n'
 +        + '\n];\n}\n'
  
      if pyversion[:1] in ['2']:
          f = open(os.path.join('..', '..', '..', 'languages', 'data', 'ZhConversion.php'), 'wb', encoding='utf8')