From fa3082565692b02d95327333fb85ca777bebae1f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 4 Jun 2020 14:53:13 +0800
Subject: [PATCH] tweak about locale

---
 app/Http/View/Composers/LanguagesMenuComposer.php | 3 +--
 config/locales.php                                | 6 +++---
 resources/views/shared/languages.twig             | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Http/View/Composers/LanguagesMenuComposer.php b/app/Http/View/Composers/LanguagesMenuComposer.php
index 98be1ad4..d0bc6404 100644
--- a/app/Http/View/Composers/LanguagesMenuComposer.php
+++ b/app/Http/View/Composers/LanguagesMenuComposer.php
@@ -34,8 +34,7 @@ class LanguagesMenuComposer
 
         $current = 'locales.'.app()->getLocale();
         $view->with([
-            'lang_short_name' => config($current.'.short_name'),
-            'lang_name' => config($current.'.name'),
+            'current' => config($current.'.name'),
             'langs' => $langs,
         ]);
     }
diff --git a/config/locales.php b/config/locales.php
index 30066cc9..ef2c33e5 100644
--- a/config/locales.php
+++ b/config/locales.php
@@ -11,20 +11,20 @@ return [
     */
     'zh_CN' => [
         'name' => '中文 (简体)',
-        'short_name' => 'ZH (CN)',
+        'short_name' => 'zh-CN',
     ],
     'zh_HANS_CN' => [
         'alias' => 'zh_CN',
     ],
     'en' => [
         'name' => 'English',
-        'short_name' => 'EN',
+        'short_name' => 'en',
     ],
     'en_US' => [
         'alias' => 'en',
     ],
     'es_ES' => [
         'name' => 'Español',
-        'short_name' => 'ES'
+        'short_name' => 'es'
     ],
 ];
diff --git a/resources/views/shared/languages.twig b/resources/views/shared/languages.twig
index cc22ed6a..d2d3bb98 100644
--- a/resources/views/shared/languages.twig
+++ b/resources/views/shared/languages.twig
@@ -1,7 +1,7 @@
 <li class="nav-item dropdown">
   <a class="nav-link" data-toggle="dropdown" href="#">
     <i class="fas fa-language" aria-hidden="true"></i>
-    <span class="d-none d-sm-inline">{{ lang_short_name }}</span>
+    <span class="d-none d-sm-inline">{{ current }}</span>
   </a>
   <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
     {% for lang in langs %}