From fe959450adc8a685dedcbed4bb9f95e4a74a7e35 Mon Sep 17 00:00:00 2001
From: Kate Pimenova <kpimenova@mirantis.com>
Date: Wed, 10 Jun 2015 15:43:45 +0300
Subject: [PATCH] Language chooser control show full names of languages

Closes-Bug:#1443922

Change-Id: Id0c4f0a8cd42cd583f98ad7347264821071f875f
---
 nailgun/static/i18n.js                | 3 +++
 nailgun/static/styles/main.less       | 2 +-
 nailgun/static/translations/core.json | 4 ++++
 nailgun/static/views/layout.jsx       | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nailgun/static/i18n.js b/nailgun/static/i18n.js
index 0a8013052c..c8369ace89 100644
--- a/nailgun/static/i18n.js
+++ b/nailgun/static/i18n.js
@@ -30,6 +30,9 @@ define([
         getLocaleName: function(locale) {
             return i18n('language', {lng: locale});
         },
+        getLanguageName: function(locale) {
+            return i18n('language_name', {lng: locale});
+        },
         getAvailableLocales: function() {
             return _.keys(translations).sort();
         },
diff --git a/nailgun/static/styles/main.less b/nailgun/static/styles/main.less
index 4f9d4528ae..ab9f284de7 100644
--- a/nailgun/static/styles/main.less
+++ b/nailgun/static/styles/main.less
@@ -665,7 +665,7 @@ button, .btn:not(.btn-link) {.font-semibold;}
     }
 
     &.language-popover {
-      .popover-layout(@index: 3, @width: 90px);
+      .popover-layout(@index: 3, @width: 110px);
       a {
         cursor: pointer;
       }
diff --git a/nailgun/static/translations/core.json b/nailgun/static/translations/core.json
index 7af37eea8f..e82e7daf68 100644
--- a/nailgun/static/translations/core.json
+++ b/nailgun/static/translations/core.json
@@ -2,6 +2,7 @@
     "en-US": {
         "translation": {
             "language": "EN",
+            "language_name": "English",
             "common": {
                 "title": "Fuel Dashboard",
                 "select_all": "Select All",
@@ -784,6 +785,7 @@
     "zh-CN": {
         "translation": {
             "language": "CN",
+            "language_name": "中国语文",
             "common": {
                 "title": "Fuel Dashboard",
                 "select_all": "选择全部",
@@ -1307,6 +1309,7 @@
     "ja-JP": {
         "translation": {
             "language": "JA",
+            "language_name": "日本語",
             "common": {
                 "title": "Fuel ダッシュボード",
                 "select_all": "全部選択",
@@ -1766,6 +1769,7 @@
     "ko-KR": {
         "translation": {
             "language": "KO",
+            "language_name": "한국말",
             "common": {
                 "title": "Fuel 대시보드",
                 "select_all": "모두선택",
diff --git a/nailgun/static/views/layout.jsx b/nailgun/static/views/layout.jsx
index 08cae5d546..f7a6a664b8 100644
--- a/nailgun/static/views/layout.jsx
+++ b/nailgun/static/views/layout.jsx
@@ -198,7 +198,7 @@ function($, _, i18n, Backbone, React, utils, models, controls, componentMixins,
                             return (
                                 <li key={locale} className={utils.classNames({active: locale == currentLocale})}>
                                     <a onClick={_.partial(this.changeLocale, locale)}>
-                                        {i18n.getLocaleName(locale)}
+                                        {i18n.getLanguageName(locale)}
                                     </a>
                                 </li>
                             );