From 030783108145fe3811164b59a64336b68e57f240 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Tue, 14 Feb 2023 17:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A4=9A=E8=AF=AD=E8=A8=80,?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=A0=87=E9=A2=98=E6=88=AA=E5=8F=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Resources/PageCategoryResource.php | 2 +- beike/Shop/Http/Resources/PageCategoryDetail.php | 2 +- beike/Shop/Http/Resources/PageDetail.php | 2 +- .../admin/views/pages/categories/form.blade.php | 4 ++-- .../views/pages/page_categories/form.blade.php | 2 +- resources/lang/de/admin/attribute.php | 2 +- resources/lang/de/admin/attribute_group.php | 4 ++-- resources/lang/de/admin/category.php | 2 +- resources/lang/en/admin/category.php | 2 +- resources/lang/en/admin/page_categories.php | 8 ++++---- resources/lang/es/admin/attribute.php | 2 +- resources/lang/es/admin/attribute_group.php | 2 +- resources/lang/es/admin/category.php | 2 +- resources/lang/fr/admin/attribute.php | 2 +- resources/lang/fr/admin/attribute_group.php | 2 +- resources/lang/fr/admin/category.php | 16 ++++++++-------- resources/lang/it/admin/attribute.php | 2 +- resources/lang/it/admin/attribute_group.php | 2 +- resources/lang/it/admin/category.php | 16 ++++++++-------- resources/lang/ja/admin/attribute.php | 2 +- resources/lang/ja/admin/attribute_group.php | 2 +- resources/lang/ja/admin/category.php | 16 ++++++++-------- resources/lang/ru/admin/attribute.php | 2 +- resources/lang/ru/admin/attribute_group.php | 2 +- resources/lang/ru/admin/category.php | 16 ++++++++-------- resources/lang/zh_cn/admin/category.php | 16 ++++++++-------- resources/lang/zh_hk/admin/category.php | 16 ++++++++-------- 27 files changed, 74 insertions(+), 74 deletions(-) diff --git a/beike/Admin/Http/Resources/PageCategoryResource.php b/beike/Admin/Http/Resources/PageCategoryResource.php index d4150622..693f0027 100644 --- a/beike/Admin/Http/Resources/PageCategoryResource.php +++ b/beike/Admin/Http/Resources/PageCategoryResource.php @@ -23,7 +23,7 @@ class PageCategoryResource extends JsonResource 'id' => $this->id, 'active' => $this->active, 'title' => $description->title, - 'title_format' => sub_string($description->title), + 'title_format' => sub_string($description->title, 64), 'summary' => $description->summary, 'summary_format' => sub_string($description->summary, 128), 'meta_title' => $description->meta_title, diff --git a/beike/Shop/Http/Resources/PageCategoryDetail.php b/beike/Shop/Http/Resources/PageCategoryDetail.php index 9ab4aae8..7a1771fc 100644 --- a/beike/Shop/Http/Resources/PageCategoryDetail.php +++ b/beike/Shop/Http/Resources/PageCategoryDetail.php @@ -23,7 +23,7 @@ class PageCategoryDetail extends JsonResource 'id' => $this->id, 'active' => $this->active, 'title' => $description->title, - 'title_format' => sub_string($description->title), + 'title_format' => sub_string($description->title, 64), 'summary' => $description->summary, 'summary_format' => sub_string($description->summary, 128), 'meta_title' => $description->meta_title, diff --git a/beike/Shop/Http/Resources/PageDetail.php b/beike/Shop/Http/Resources/PageDetail.php index afd5ec2e..0465efca 100644 --- a/beike/Shop/Http/Resources/PageDetail.php +++ b/beike/Shop/Http/Resources/PageDetail.php @@ -32,7 +32,7 @@ class PageDetail extends JsonResource 'author' => $this->author, 'views' => $this->views, 'title' => $description->title, - 'title_format' => sub_string($description->title), + 'title_format' => sub_string($description->title, 64), 'content' => $description->content, 'summary' => $description->summary, 'summary_format' => sub_string($description->summary, 100), diff --git a/resources/beike/admin/views/pages/categories/form.blade.php b/resources/beike/admin/views/pages/categories/form.blade.php index 4d751cc6..412e0f4b 100644 --- a/resources/beike/admin/views/pages/categories/form.blade.php +++ b/resources/beike/admin/views/pages/categories/form.blade.php @@ -21,7 +21,7 @@ {{-- --}} - + @php $_parent_id = old('parent_id', $category->parent_id ?? 0); @endphp @@ -69,4 +69,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/beike/admin/views/pages/page_categories/form.blade.php b/resources/beike/admin/views/pages/page_categories/form.blade.php index 6b71df66..1a2012b1 100644 --- a/resources/beike/admin/views/pages/page_categories/form.blade.php +++ b/resources/beike/admin/views/pages/page_categories/form.blade.php @@ -67,7 +67,7 @@
- +
diff --git a/resources/lang/de/admin/attribute.php b/resources/lang/de/admin/attribute.php index 3b84e834..ee6a0406 100644 --- a/resources/lang/de/admin/attribute.php +++ b/resources/lang/de/admin/attribute.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute', 'attribute_info' => 'Attribute information', 'create_at' => 'Create attribute', diff --git a/resources/lang/de/admin/attribute_group.php b/resources/lang/de/admin/attribute_group.php index c60ef0e5..61d037cb 100644 --- a/resources/lang/de/admin/attribute_group.php +++ b/resources/lang/de/admin/attribute_group.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', 'error_cannot_delete_attribute_used' => 'Attribute Group used by attribute (ID: :attributes), can not be deleted!', @@ -19,4 +19,4 @@ 'attribute_groups_show' => 'attribute group details', 'attribute_groups_update' => 'update attribute group', 'attribute_groups_delete' => 'delete attribute group', -]; \ No newline at end of file +]; diff --git a/resources/lang/de/admin/category.php b/resources/lang/de/admin/category.php index 347497ae..b08ea3ef 100644 --- a/resources/lang/de/admin/category.php +++ b/resources/lang/de/admin/category.php @@ -12,7 +12,7 @@ return [ 'index' => 'Kategorie', 'edit_category' => 'Kategorie bearbeiten', - 'upper_category' => 'höhere Kategorie', + 'parent_category' => 'höhere Kategorie', 'categories_index' => 'Kategorieliste', 'categories_create' => 'Kategorien erstellen', diff --git a/resources/lang/en/admin/category.php b/resources/lang/en/admin/category.php index 599b44af..b3838fc6 100644 --- a/resources/lang/en/admin/category.php +++ b/resources/lang/en/admin/category.php @@ -12,7 +12,7 @@ return [ 'index' => 'Category', 'edit_category' => 'Edit Category', - 'upper_category' => 'Upper Category', + 'parent_category' => 'Parent Category', 'categories_index' => 'Index', 'categories_create' => 'Create', diff --git a/resources/lang/en/admin/page_categories.php b/resources/lang/en/admin/page_categories.php index 9cda38c4..0629abc0 100644 --- a/resources/lang/en/admin/page_categories.php +++ b/resources/lang/en/admin/page_categories.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'article classification', - 'info_title' => 'information title', - 'info_content' => 'content', + 'index' => 'Catalogs', + 'info_title' => 'Title', + 'info_content' => 'Content', - 'pages_index' => 'category list', + 'pages_index' => 'Catalogs', ]; diff --git a/resources/lang/es/admin/attribute.php b/resources/lang/es/admin/attribute.php index 3b84e834..ee6a0406 100644 --- a/resources/lang/es/admin/attribute.php +++ b/resources/lang/es/admin/attribute.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute', 'attribute_info' => 'Attribute information', 'create_at' => 'Create attribute', diff --git a/resources/lang/es/admin/attribute_group.php b/resources/lang/es/admin/attribute_group.php index a687ef33..61d037cb 100644 --- a/resources/lang/es/admin/attribute_group.php +++ b/resources/lang/es/admin/attribute_group.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', 'error_cannot_delete_attribute_used' => 'Attribute Group used by attribute (ID: :attributes), can not be deleted!', diff --git a/resources/lang/es/admin/category.php b/resources/lang/es/admin/category.php index 7650ec87..459365d9 100644 --- a/resources/lang/es/admin/category.php +++ b/resources/lang/es/admin/category.php @@ -12,7 +12,7 @@ return [ 'index' => 'Clasificación', 'edit_category' => 'Editar categoria', - 'upper_category' => 'subtítulos', + 'parent_category' => 'subtítulos', 'categories_index' => 'Lista de categoría', 'categories_create' => 'Crear una taxonomía', diff --git a/resources/lang/fr/admin/attribute.php b/resources/lang/fr/admin/attribute.php index 3b84e834..ee6a0406 100644 --- a/resources/lang/fr/admin/attribute.php +++ b/resources/lang/fr/admin/attribute.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute', 'attribute_info' => 'Attribute information', 'create_at' => 'Create attribute', diff --git a/resources/lang/fr/admin/attribute_group.php b/resources/lang/fr/admin/attribute_group.php index a687ef33..61d037cb 100644 --- a/resources/lang/fr/admin/attribute_group.php +++ b/resources/lang/fr/admin/attribute_group.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', 'error_cannot_delete_attribute_used' => 'Attribute Group used by attribute (ID: :attributes), can not be deleted!', diff --git a/resources/lang/fr/admin/category.php b/resources/lang/fr/admin/category.php index aa1b55fd..ff3fb84c 100644 --- a/resources/lang/fr/admin/category.php +++ b/resources/lang/fr/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Classification', - 'edit_category' => 'Modifier la catégorie', - 'upper_category' => 'catégorie supérieure', + 'index' => 'Classification', + 'edit_category' => 'Modifier la catégorie', + 'parent_category' => 'catégorie supérieure', - 'categories_index' => 'liste des catégories', - 'categories_create' => 'Créer des catégories', - 'categories_show' => 'détails de la catégorie', - 'categories_update' => 'Mettre à jour les catégories', - 'categories_delete' => 'Supprimer la catégorie', + 'categories_index' => 'liste des catégories', + 'categories_create' => 'Créer des catégories', + 'categories_show' => 'détails de la catégorie', + 'categories_update' => 'Mettre à jour les catégories', + 'categories_delete' => 'Supprimer la catégorie', ]; diff --git a/resources/lang/it/admin/attribute.php b/resources/lang/it/admin/attribute.php index 3b84e834..ee6a0406 100644 --- a/resources/lang/it/admin/attribute.php +++ b/resources/lang/it/admin/attribute.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute', 'attribute_info' => 'Attribute information', 'create_at' => 'Create attribute', diff --git a/resources/lang/it/admin/attribute_group.php b/resources/lang/it/admin/attribute_group.php index a687ef33..61d037cb 100644 --- a/resources/lang/it/admin/attribute_group.php +++ b/resources/lang/it/admin/attribute_group.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', 'error_cannot_delete_attribute_used' => 'Attribute Group used by attribute (ID: :attributes), can not be deleted!', diff --git a/resources/lang/it/admin/category.php b/resources/lang/it/admin/category.php index d5b6b7a5..18f84d9d 100644 --- a/resources/lang/it/admin/category.php +++ b/resources/lang/it/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Classificazione', - 'edit_category' => 'Modifica categoria', - 'upper_category' => 'Sottotitoli', + 'index' => 'Classificazione', + 'edit_category' => 'Modifica categoria', + 'parent_category' => 'Sottotitoli', - 'categories_index' => 'Elenco delle categorie', - 'categories_create' => 'Crea una tassonomia', - 'categories_show' => 'Dettagli della categoria', - 'categories_update' => 'Aggiorna la classificazione', - 'categories_delete' => 'elimina categoria', + 'categories_index' => 'Elenco delle categorie', + 'categories_create' => 'Crea una tassonomia', + 'categories_show' => 'Dettagli della categoria', + 'categories_update' => 'Aggiorna la classificazione', + 'categories_delete' => 'elimina categoria', ]; diff --git a/resources/lang/ja/admin/attribute.php b/resources/lang/ja/admin/attribute.php index 3b84e834..ee6a0406 100644 --- a/resources/lang/ja/admin/attribute.php +++ b/resources/lang/ja/admin/attribute.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute', 'attribute_info' => 'Attribute information', 'create_at' => 'Create attribute', diff --git a/resources/lang/ja/admin/attribute_group.php b/resources/lang/ja/admin/attribute_group.php index a687ef33..61d037cb 100644 --- a/resources/lang/ja/admin/attribute_group.php +++ b/resources/lang/ja/admin/attribute_group.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', 'error_cannot_delete_attribute_used' => 'Attribute Group used by attribute (ID: :attributes), can not be deleted!', diff --git a/resources/lang/ja/admin/category.php b/resources/lang/ja/admin/category.php index 28fe9306..a50823f4 100644 --- a/resources/lang/ja/admin/category.php +++ b/resources/lang/ja/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'カテゴリ', - 'edit_category' => 'カテゴリを編集', - 'upper_category' => '上位カテゴリ', + 'index' => 'カテゴリ', + 'edit_category' => 'カテゴリを編集', + 'parent_category' => '上位カテゴリ', - 'categories_index' => 'カテゴリーリスト', - 'categories_create' => 'カテゴリを作成', - 'categories_show' => 'カテゴリーの詳細', - 'categories_update' => 'カテゴリを更新', - 'categories_delete' => 'カテゴリを削除', + 'categories_index' => 'カテゴリーリスト', + 'categories_create' => 'カテゴリを作成', + 'categories_show' => 'カテゴリーの詳細', + 'categories_update' => 'カテゴリを更新', + 'categories_delete' => 'カテゴリを削除', ]; diff --git a/resources/lang/ru/admin/attribute.php b/resources/lang/ru/admin/attribute.php index 3b84e834..ee6a0406 100644 --- a/resources/lang/ru/admin/attribute.php +++ b/resources/lang/ru/admin/attribute.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute', 'attribute_info' => 'Attribute information', 'create_at' => 'Create attribute', diff --git a/resources/lang/ru/admin/attribute_group.php b/resources/lang/ru/admin/attribute_group.php index a687ef33..61d037cb 100644 --- a/resources/lang/ru/admin/attribute_group.php +++ b/resources/lang/ru/admin/attribute_group.php @@ -9,7 +9,7 @@ * @modified 2022-08-02 14:22:41 */ - return [ +return [ 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', 'error_cannot_delete_attribute_used' => 'Attribute Group used by attribute (ID: :attributes), can not be deleted!', diff --git a/resources/lang/ru/admin/category.php b/resources/lang/ru/admin/category.php index 58733f34..122aa7a0 100644 --- a/resources/lang/ru/admin/category.php +++ b/resources/lang/ru/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'категория', - 'edit_category' => 'Изменить категорию', - 'upper_category' => 'категория', + 'index' => 'категория', + 'edit_category' => 'Изменить категорию', + 'parent_category' => 'категория', - 'categories_index' => 'список категорий', - 'categories_create' => 'Создать категории', - 'categories_show' => 'детали категории', - 'categories_update' => 'Обновить категории', - 'categories_delete' => 'Удалить категорию', + 'categories_index' => 'список категорий', + 'categories_create' => 'Создать категории', + 'categories_show' => 'детали категории', + 'categories_update' => 'Обновить категории', + 'categories_delete' => 'Удалить категорию', ]; diff --git a/resources/lang/zh_cn/admin/category.php b/resources/lang/zh_cn/admin/category.php index dcc36ca9..70951990 100644 --- a/resources/lang/zh_cn/admin/category.php +++ b/resources/lang/zh_cn/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '分类', - 'edit_category' => '编辑分类', - 'upper_category' => '上级分类', + 'index' => '分类', + 'edit_category' => '编辑分类', + 'parent_category' => '上级分类', - 'categories_index' => '分类列表', - 'categories_create' => '创建分类', - 'categories_show' => '分类详情', - 'categories_update' => '更新分类', - 'categories_delete' => '删除分类', + 'categories_index' => '分类列表', + 'categories_create' => '创建分类', + 'categories_show' => '分类详情', + 'categories_update' => '更新分类', + 'categories_delete' => '删除分类', ]; diff --git a/resources/lang/zh_hk/admin/category.php b/resources/lang/zh_hk/admin/category.php index 023094b5..149655ac 100644 --- a/resources/lang/zh_hk/admin/category.php +++ b/resources/lang/zh_hk/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '分類', - 'edit_category' => '編輯分類', - 'upper_category' => '上級分類', + 'index' => '分類', + 'edit_category' => '編輯分類', + 'parent_category' => '上級分類', - 'categories_index' => '分類列表', - 'categories_create' => '創建分類', - 'categories_show' => '分類詳情', - 'categories_update' => '更新分類', - 'categories_delete' => '刪除分類', + 'categories_index' => '分類列表', + 'categories_create' => '創建分類', + 'categories_show' => '分類詳情', + 'categories_update' => '更新分類', + 'categories_delete' => '刪除分類', ];