From 3e03a7633333b68708851818ed6d26881252be41 Mon Sep 17 00:00:00 2001
From: Luis <Frost_Leviathan@hotmail.com>
Date: Thu, 16 Aug 2018 16:52:48 +0000
Subject: [PATCH 1/3] added the option to translate the menu titles from the
 language files

---
 resources/lang/ar/admin.php             |  2 ++
 resources/lang/en/admin.php             |  2 ++
 resources/lang/es/admin.php             |  2 ++
 resources/lang/fa/admin.php             |  2 ++
 resources/lang/fr/admin.php             |  2 ++
 resources/lang/he/admin.php             |  2 ++
 resources/lang/ja/admin.php             |  2 ++
 resources/lang/nl/admin.php             |  2 ++
 resources/lang/pl/admin.php             |  2 ++
 resources/lang/pt-BR/admin.php          |  2 ++
 resources/lang/pt/admin.php             |  2 ++
 resources/lang/ru/admin.php             |  2 ++
 resources/lang/tr/admin.php             |  2 ++
 resources/lang/zh-CN/admin.php          |  1 +
 resources/lang/zh-TW/admin.php          |  1 +
 resources/views/partials/menu.blade.php | 10 +++++++---
 16 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/resources/lang/ar/admin.php b/resources/lang/ar/admin.php
index 21a44a2441..088a4f42ab 100644
--- a/resources/lang/ar/admin.php
+++ b/resources/lang/ar/admin.php
@@ -111,4 +111,6 @@
         'filter_clear'       => 'عرض الكل',
         'filter_placeholder' => 'تنقية',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php
index d92a2901ee..0f64bde9ee 100644
--- a/resources/lang/en/admin.php
+++ b/resources/lang/en/admin.php
@@ -97,4 +97,6 @@
         'filter_clear'       => 'Show all',
         'filter_placeholder' => 'Filter',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/es/admin.php b/resources/lang/es/admin.php
index fe0fc4e6eb..864aebef52 100644
--- a/resources/lang/es/admin.php
+++ b/resources/lang/es/admin.php
@@ -97,4 +97,6 @@
     'all'           => 'Todas',
     'current_page'  => 'Página actual',
     'selected_rows' => 'Filas seleccionadas',
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/fa/admin.php b/resources/lang/fa/admin.php
index 5b07a4ebe5..69f0d369fa 100644
--- a/resources/lang/fa/admin.php
+++ b/resources/lang/fa/admin.php
@@ -111,4 +111,6 @@
         'filter_clear'       => 'نمایش همه',
         'filter_placeholder' => 'فیلتر کردن',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/fr/admin.php b/resources/lang/fr/admin.php
index 3576109643..ac723a4fed 100644
--- a/resources/lang/fr/admin.php
+++ b/resources/lang/fr/admin.php
@@ -111,4 +111,6 @@
         'filter_clear'       => 'Affichez tous',
         'filter_placeholder' => 'Filtre',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/he/admin.php b/resources/lang/he/admin.php
index b7669e212e..b40b6710b1 100644
--- a/resources/lang/he/admin.php
+++ b/resources/lang/he/admin.php
@@ -72,4 +72,6 @@
     'pagination'            => [
         'range' => ':last מ :total תוצאות',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/ja/admin.php b/resources/lang/ja/admin.php
index 17166dd256..60a82354aa 100644
--- a/resources/lang/ja/admin.php
+++ b/resources/lang/ja/admin.php
@@ -111,4 +111,6 @@
         'filter_clear'       => '全て表示',
         'filter_placeholder' => 'フィルタ',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/nl/admin.php b/resources/lang/nl/admin.php
index 286743253f..cab71c706f 100644
--- a/resources/lang/nl/admin.php
+++ b/resources/lang/nl/admin.php
@@ -111,4 +111,6 @@
         'filter_clear'       => 'Toon alle',
         'filter_placeholder' => 'Filter',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/pl/admin.php b/resources/lang/pl/admin.php
index fd46257a53..923735f198 100644
--- a/resources/lang/pl/admin.php
+++ b/resources/lang/pl/admin.php
@@ -82,4 +82,6 @@
     'pagination' => [
         'range' => 'Wyświetlono :first do :last z wszystkich :total',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/pt-BR/admin.php b/resources/lang/pt-BR/admin.php
index 6057520239..802f2deab9 100644
--- a/resources/lang/pt-BR/admin.php
+++ b/resources/lang/pt-BR/admin.php
@@ -112,4 +112,6 @@
         'filter_clear'       => 'Mostrar tudo',
         'filter_placeholder' => 'Filtrar',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/pt/admin.php b/resources/lang/pt/admin.php
index f4c5ae48d4..82ffcd50cc 100644
--- a/resources/lang/pt/admin.php
+++ b/resources/lang/pt/admin.php
@@ -112,4 +112,6 @@
         'filter_clear'       => 'Mostrar tudo',
         'filter_placeholder' => 'Filtrar',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/ru/admin.php b/resources/lang/ru/admin.php
index 6e0fadc40f..07a25aa145 100644
--- a/resources/lang/ru/admin.php
+++ b/resources/lang/ru/admin.php
@@ -82,4 +82,6 @@
     'pagination' => [
         'range' => 'Записи с :first по :last из :total',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/tr/admin.php b/resources/lang/tr/admin.php
index 17f52b4d01..a014acc2b2 100644
--- a/resources/lang/tr/admin.php
+++ b/resources/lang/tr/admin.php
@@ -112,4 +112,6 @@
         'filter_clear'       => 'Tümümnü göster',
         'filter_placeholder' => 'Filtrele',
     ],
+
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/zh-CN/admin.php b/resources/lang/zh-CN/admin.php
index 1b8e53bde6..0e6133d2dc 100644
--- a/resources/lang/zh-CN/admin.php
+++ b/resources/lang/zh-CN/admin.php
@@ -97,4 +97,5 @@
         'filter_clear'       => '显示全部',
         'filter_placeholder' => '过滤',
     ],
+    'menu_titles' => [],
 ];
diff --git a/resources/lang/zh-TW/admin.php b/resources/lang/zh-TW/admin.php
index 4673a8e2bb..0019ebcc56 100644
--- a/resources/lang/zh-TW/admin.php
+++ b/resources/lang/zh-TW/admin.php
@@ -97,4 +97,5 @@
         'filter_clear'       => '顯示全部',
         'filter_placeholder' => '過濾',
     ],
+    'menu_titles' => [],
 ];
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index eaee03c6d0..9e07605fb7 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -7,14 +7,18 @@
                  <a href="{{ admin_base_path($item['uri']) }}">
             @endif
                 <i class="fa {{$item['icon']}}"></i>
-                <span>{{$item['title']}}</span>
+                @if (Lang::has($titleTranslation = 'admin.menu_titles.' . trim(str_replace(' ', '_', strtolower($item['title'])))))
+                    <span>{{ __($titleTranslation) }}</span>
+                @else
+                    <span>{{ $item['title'] }}</span>
+                @endif
             </a>
         </li>
     @else
         <li class="treeview">
             <a href="#">
-                <i class="fa {{$item['icon']}}"></i>
-                <span>{{$item['title']}}</span>
+                <i class="fa {{ $item['icon'] }}"></i>
+                <span>{{ $item['title'] }}</span>
                 <i class="fa fa-angle-left pull-right"></i>
             </a>
             <ul class="treeview-menu">

From 9162b342f835b2518bc1d53758f482889eda9be0 Mon Sep 17 00:00:00 2001
From: Luis <Frost_Leviathan@hotmail.com>
Date: Thu, 16 Aug 2018 17:06:21 +0000
Subject: [PATCH 2/3] updated docs

---
 docs/en/quick-start.md | 14 ++++++++++++++
 docs/zh/quick-start.md | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/docs/en/quick-start.md b/docs/en/quick-start.md
index f93fecdf8c..94592e547a 100644
--- a/docs/en/quick-start.md
+++ b/docs/en/quick-start.md
@@ -43,6 +43,20 @@ Open `http://localhost:8000/admin/auth/menu`, add menu link and refresh the page
 
 > Where `uri` fills in the path part that does not contain the prefix of the route, such as the full path `http://localhost:8000/admin/demo/users`, just input `demo/users`, If you want to add an external link, just fill in the full url, such as `http://laravel-admin.org/`.
 
+### Menu translations
+
+append menu titles in menu_titles index at your language files.
+For example 'Work Units' title:
+
+in resources/lang/es/admin.php
+```php
+...
+// lowercase and replace spaces with _
+'menu_titles' => [
+    'work_units' => 'Unidades de trabajo'
+],
+```
+
 ## Build grid and form
 
 The rest needs to be done is open `app/Admin/Contollers/UserController.php`, find `form()` and `grid()` method and write few lines of code with `model-grid` and `model-form`,for more detail, please read [model-grid](/en/model-grid.md) and [model-form](/en/model-form.md).
diff --git a/docs/zh/quick-start.md b/docs/zh/quick-start.md
index 100956f931..b178ba46cb 100644
--- a/docs/zh/quick-start.md
+++ b/docs/zh/quick-start.md
@@ -44,6 +44,20 @@ $router->resource('users', UserController::class);
 
 > 其中`uri`填写不包含路由前缀的的路径部分，比如完整路径是`http://localhost:8000/admin/demo/users`, 那么就填`demo/users`，如果要添加外部链接，只要填写完整的url即可，比如`http://laravel-admin.org/`.
 
+### 菜单翻译
+
+在您的语言文件的menu_titles索引中追加菜单标题。
+例如“工作单位”标题：
+
+在resources/lang/es/admin.php中
+```php
+...
+// 用_小写并用_替换空格
+'menu_titles' => [
+    'work_units' => 'Unidades de trabajo'
+],
+```
+
 ## 创建表格表单
 
 剩下的工作就是构建数据表格和表单了，打开 `app/Admin/Contollers/UserController.php`,找到`form()`和`grid()`方法，然添加构建代码更多详细使用请查看[model-grid](/zh/model-grid.md)和[model-form](/zh/model-form.md)。

From 11c034bae979250aed3609216f213ef06eb3f987 Mon Sep 17 00:00:00 2001
From: Luis <Frost_Leviathan@hotmail.com>
Date: Thu, 16 Aug 2018 17:16:03 +0000
Subject: [PATCH 3/3] updated docs

---
 docs/en/model-form-fields.md | 16 ++++++++++++++++
 docs/zh/model-form-fields.md | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/docs/en/model-form-fields.md b/docs/en/model-form-fields.md
index d1eb7c9288..d8d520993b 100644
--- a/docs/en/model-form-fields.md
+++ b/docs/en/model-form-fields.md
@@ -84,6 +84,14 @@ $form->select('user_id')->options(function ($id) {
         return [$user->id => $user->name];
     }
 })->ajax('/admin/api/users');
+
+// using ajax and show selected item:
+
+$form->select('user_id')->options(User::class)->ajax('/admin/api/users');
+
+// or specifying the name and id
+
+$form->select('user_id')->options(User::class, 'name', 'id')->ajax('/admin/api/users');
 ```
 
 <sub>Notice：if you have modified the value of the `route.prefix` in the `config/admin.php` file, this api route should be modified to `config('admin.route.prefix').'/api/users'`.</sub>
@@ -171,6 +179,14 @@ public function city(Request $request)
 ## Multiple select
 ```php
 $form->multipleSelect($column[, $label])->options([1 => 'foo', 2 => 'bar', 'val' => 'Option name']);
+
+// using ajax and show selected items:
+
+$form->multipleSelect($column[, $label])->options(Model::class)->ajax('ajax_url');
+
+// or specifying the name and id
+
+$form->multipleSelect($column[, $label])->options(Model::class, 'name', 'id')->ajax('ajax_url');
 ```
 
 You can store value of multiple select in two ways, one is `many-to-many` relation.
diff --git a/docs/zh/model-form-fields.md b/docs/zh/model-form-fields.md
index 99c5ccc6bd..0b8602ceea 100644
--- a/docs/zh/model-form-fields.md
+++ b/docs/zh/model-form-fields.md
@@ -77,6 +77,14 @@ $form->select($column[, $label])->options([1 => 'foo', 2 => 'bar', 'val' => 'Opt
 或者从api中获取选项列表：
 ```php
 $form->select($column[, $label])->options('/api/users');
+
+// 使用ajax并显示所选项目
+
+$form->select($column[, $label])->options(Model::class)->ajax('/api/users');
+
+// 或指定名称和ID
+
+$form->select($column[, $label])->options(Model::class, 'name', 'id')->ajax('/api/users');
 ```
 其中api接口的格式必须为下面格式：
 ```php
@@ -190,6 +198,14 @@ public function city(Request $request)
 
 ```php
 $form->multipleSelect($column[, $label])->options([1 => 'foo', 2 => 'bar', 'val' => 'Option name']);
+
+// 使用ajax并显示所选项目：
+
+$form->multipleSelect($column[, $label])->options(Model::class)->ajax('ajax_url');
+
+// 或指定名称和ID
+
+$form->multipleSelect($column[, $label])->options(Model::class, 'name', 'id')->ajax('ajax_url');
 ```
 
 多选框可以处理两种情况，第一种是`ManyToMany`的关系。