Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I99ee6f8b4bdc372437ee60d1feab931487fe55c4

1 files changed, 3 insertions, 3 deletions

diff --git a/util/locale_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py
index fdb0a34037..7f98e29d47 100755
--- a/util/locale_database/cldr2qlocalexml.py
+++ b/util/locale_database/cldr2qlocalexml.py
@@ -61,7 +61,7 @@ import enumdata
 import xpathlite
 from xpathlite import DraftResolution, findAlias, findEntry, findTagsInFile
 from dateconverter import convert_date
-from localexml import Locale
+from qlocalexml import Locale
 
 # TODO: make calendars a command-line option
 calendars = ['gregorian', 'persian', 'islamic'] # 'hebrew'
@@ -335,8 +335,8 @@ def _generateLocaleInfo(path, language_code, script_code, country_code, variant_
         endonym = findEntryDef(path, "localeDisplayNames/languages/language[type=%s_%s]" % (language_code, country_code))
     if not endonym:
         endonym = findEntryDef(path, "localeDisplayNames/languages/language[type=%s]" % (language_code))
-    result['language_endonym'] = endonym
-    result['country_endonym'] = findEntryDef(path, "localeDisplayNames/territories/territory[type=%s]" % (country_code))
+    result['languageEndonym'] = endonym
+    result['countryEndonym'] = findEntryDef(path, "localeDisplayNames/territories/territory[type=%s]" % (country_code))
 
     currency_format = get_number_in_system(path, "numbers/currencyFormats/currencyFormatLength/currencyFormat/pattern", numbering_system)
     currency_format = parse_number_format(currency_format, result)