From 589827a4148aea46477c52ff8c109a7dd9880d80 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 10 Jan 2017 10:35:06 -0500 Subject: [PATCH] (html) Show locale codes beside language names --- NEWS | 6 ++++++ UI/PreferencesUI/UIxPreferences.m | 9 +++++++++ UI/Templates/PreferencesUI/UIxPreferences.wox | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ac8cf1692..66e101853 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +3.2.6 (2017-02-DD) +------------------ + +Enhancements + - [web] show locale codes beside language names in Preferences module + 3.2.5 (2017-01-10) ------------------ diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 28f62d645..a1cd3ada3 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1827,6 +1827,15 @@ static NSArray *reminderValues = nil; return [self labelForKey: item]; } +- (NSDictionary *) languageLocale +{ + WOResourceManager *rm; + + rm = [self pageResourceManager]; + + return [rm localeForLanguageNamed: item]; +} + // // Used by wox template // diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index 7fae5516b..2cb16b11e 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -116,7 +116,7 @@ ng-change="app.onLanguageChange(preferencesForm)"> - +