Merge pull request #2780 from kuzmina-mariya/fix/change_default_langu…

…ages #2778: Ошибка выбора языка в админке при создании/редактировании моделей (@kuzmina-mariya)
yupe · Dec 18, 2018 · e2fa6c5 · e2fa6c5
2 parents a85a09e + 7ee6367
commit e2fa6c5
Show file tree

Hide file tree

Showing 30 changed files with 3 additions and 359 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Версия 1.3 В разработке
 -----------------------
 
+- #2778: Ошибка выбора языка в админке при создании/редактировании моделей (@kuzmina-mariya)
 - #2697: Выбор ссылки для пункта меню, через диалоговое окно (@krupni, @dzhedai)
 - #2642: Модуль магазина активен при заходе в раздел Товаров (@tmsk70, @kuzmina-mariya)
 - #2665: Not checking return value of YWebUser::login in AuthenticationManager::login() [56 line] is serious bug (@fazliddin, @kuzmina-mariya)

diff --git a/protected/modules/blog/messages/uk_ua/blog.php b/protected/modules/blog/messages/uk_ua/blog.php
diff --git a/...cted/modules/blog/messages/zh_cn/blog.php → protected/modules/blog/messages/zh/blog.php b/...cted/modules/blog/messages/zh_cn/blog.php → protected/modules/blog/messages/zh/blog.php
diff --git a/...ules/callback/messages/uk_ua/callback.php → ...modules/callback/messages/uk/callback.php b/...ules/callback/messages/uk_ua/callback.php → ...modules/callback/messages/uk/callback.php
diff --git a/protected/modules/category/messages/uk_ua/category.php b/protected/modules/category/messages/uk_ua/category.php
diff --git a/...ules/category/messages/zh_cn/category.php → ...modules/category/messages/zh/category.php b/...ules/category/messages/zh_cn/category.php → ...modules/category/messages/zh/category.php
diff --git a/...odules/comment/messages/uk_ua/comment.php → ...d/modules/comment/messages/uk/comment.php b/...odules/comment/messages/uk_ua/comment.php → ...d/modules/comment/messages/uk/comment.php
diff --git a/...odules/comment/messages/zh_cn/comment.php → ...d/modules/comment/messages/zh/comment.php b/...odules/comment/messages/zh_cn/comment.php → ...d/modules/comment/messages/zh/comment.php
diff --git a/...tentblock/messages/uk_ua/contentblock.php → ...contentblock/messages/uk/contentblock.php b/...tentblock/messages/uk_ua/contentblock.php → ...contentblock/messages/uk/contentblock.php
diff --git a/...tentblock/messages/zh_cn/contentblock.php → ...contentblock/messages/zh/contentblock.php b/...tentblock/messages/zh_cn/contentblock.php → ...contentblock/messages/zh/contentblock.php
diff --git a/.../modules/coupon/messages/uk_ua/coupon.php → ...ted/modules/coupon/messages/uk/coupon.php b/.../modules/coupon/messages/uk_ua/coupon.php → ...ted/modules/coupon/messages/uk/coupon.php
diff --git a/...ules/delivery/messages/uk_ua/delivery.php → ...modules/delivery/messages/uk/delivery.php b/...ules/delivery/messages/uk_ua/delivery.php → ...modules/delivery/messages/uk/delivery.php
diff --git a/.../dictionary/messages/uk_ua/dictionary.php → ...les/dictionary/messages/uk/dictionary.php b/.../dictionary/messages/uk_ua/dictionary.php → ...les/dictionary/messages/uk/dictionary.php
diff --git a/...ules/feedback/messages/zh_cn/feedback.php → ...modules/feedback/messages/zh/feedback.php b/...ules/feedback/messages/zh_cn/feedback.php → ...modules/feedback/messages/zh/feedback.php
diff --git a/...odules/gallery/messages/zh_cn/gallery.php → ...d/modules/gallery/messages/zh/gallery.php b/...odules/gallery/messages/zh_cn/gallery.php → ...d/modules/gallery/messages/zh/gallery.php
diff --git a/...ed/modules/homepage/messages/zh_cn/hp.php → ...ected/modules/homepage/messages/zh/hp.php b/...ed/modules/homepage/messages/zh_cn/hp.php → ...ected/modules/homepage/messages/zh/hp.php
diff --git a/...ed/modules/image/messages/uk_ua/image.php → ...ected/modules/image/messages/uk/image.php b/...ed/modules/image/messages/uk_ua/image.php → ...ected/modules/image/messages/uk/image.php
diff --git a/...odules/install/messages/zh_cn/install.php → ...d/modules/install/messages/zh/install.php b/...odules/install/messages/zh_cn/install.php → ...d/modules/install/messages/zh/install.php
diff --git a/...cted/modules/mail/messages/uk_ua/mail.php → protected/modules/mail/messages/uk/mail.php b/...cted/modules/mail/messages/uk_ua/mail.php → protected/modules/mail/messages/uk/mail.php
diff --git a/...cted/modules/mail/messages/zh_cn/mail.php → protected/modules/mail/messages/zh/mail.php b/...cted/modules/mail/messages/zh_cn/mail.php → protected/modules/mail/messages/zh/mail.php
diff --git a/...cted/modules/menu/messages/zh_cn/menu.php → protected/modules/menu/messages/zh/menu.php b/...cted/modules/menu/messages/zh_cn/menu.php → protected/modules/menu/messages/zh/menu.php
diff --git a/...cted/modules/news/messages/zh_cn/news.php → protected/modules/news/messages/zh/news.php b/...cted/modules/news/messages/zh_cn/news.php → protected/modules/news/messages/zh/news.php
diff --git a/...cted/modules/page/messages/zh_cn/page.php → protected/modules/page/messages/zh/page.php b/...cted/modules/page/messages/zh_cn/page.php → protected/modules/page/messages/zh/page.php
diff --git a/.../modules/payler/messages/uk_ua/payler.php → ...ted/modules/payler/messages/uk/payler.php b/.../modules/payler/messages/uk_ua/payler.php → ...ted/modules/payler/messages/uk/payler.php
diff --git a/...cted/modules/rbac/messages/uk_ua/rbac.php → protected/modules/rbac/messages/uk/rbac.php b/...cted/modules/rbac/messages/uk_ua/rbac.php → protected/modules/rbac/messages/uk/rbac.php
diff --git a/...odules/sitemap/messages/uk_ua/sitemap.php → ...d/modules/sitemap/messages/uk/sitemap.php b/...odules/sitemap/messages/uk_ua/sitemap.php → ...d/modules/sitemap/messages/uk/sitemap.php
diff --git a/...cted/modules/user/messages/zh_cn/user.php → protected/modules/user/messages/zh/user.php b/...cted/modules/user/messages/zh_cn/user.php → protected/modules/user/messages/zh/user.php
diff --git a/protected/modules/yupe/YupeModule.php b/protected/modules/yupe/YupeModule.php
@@ -87,7 +87,7 @@ class YupeModule extends WebModule
     /**
      * @var string
      */
-    public $availableLanguages = 'ru,uk_ua,en,zh_cn';
+    public $availableLanguages = 'ru,uk,en,zh';
     /**
      * @var string
      */

diff --git a/...cted/modules/yupe/messages/zh_cn/yupe.php → protected/modules/yupe/messages/zh/yupe.php b/...cted/modules/yupe/messages/zh_cn/yupe.php → protected/modules/yupe/messages/zh/yupe.php
diff --git a/themes/default/web/css/flags.css b/themes/default/web/css/flags.css
@@ -927,7 +927,7 @@
     background-position: -64px -154px
 }
 
-.iconflags.iconflags-ua {
+.iconflags.iconflags-uk {
     background-position: -80px -154px
 }