From 2200c592897eee367fff6f5ccf7130b8c9115a5c Mon Sep 17 00:00:00 2001 From: Devansh Date: Sat, 8 Aug 2020 01:40:31 +0530 Subject: [PATCH 01/14] Added Japanese Translation --- .../Velocity/src/Resources/lang/ja/app.php | 439 +++++++++--------- 1 file changed, 219 insertions(+), 220 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/lang/ja/app.php b/packages/Webkul/Velocity/src/Resources/lang/ja/app.php index 9d1a299a1..35584b590 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/ja/app.php @@ -1,197 +1,199 @@ [ + 'admin' => [ 'system' => [ 'velocity' => [ - 'general' => 'General', - 'category' => 'Category', - 'settings' => 'Settings', - 'extension_name' => 'Velocity Theme', - 'error-module-inactive' => 'Warning: Velocity theme status is inactive', + 'general' => '一般的な', + 'category' => 'カテゴリー', + 'settings' => '設定', + 'extension_name' => '速度のテーマ', + 'error-module-inactive' => '警告：Velocityテーマのステータスは非アクティブです', ], - 'settings' => [ - 'channels'=> [ - 'subscription_bar' => 'Subscription bar content' + 'channels' => [ + 'subscription_bar' => 'サブスクリプションバーのコンテンツ' ], ], - - 'general' => [ - 'status' => 'Status', - 'active' => 'Active', - 'inactive' => 'Inactive', + 'general' => [ + 'status' => '状態', + 'active' => 'アクティブ', + 'inactive' => '非活性', ], 'category' => [ - 'all' => 'All', - 'left' => 'Left', - 'right' => 'Right', - 'active' => 'Active', - 'custom' => 'Custom', - 'inactive' => 'Inactive', - 'image-alignment' => 'Image Alignment', - 'icon-status' => 'Category Icon Status', - 'image-status' => 'Category Image Status', - 'sub-category-show' => 'Show Sub Category', - 'image-height' => 'Image\'s Height [in Pixel]', - 'image-width' => 'Image\'s Width [in Pixel]', - 'show-tooltip' => 'Show Category\'s Tooltip', - 'num-sub-category' => 'Number Of Sub Category', + 'all' => 'すべて', + 'left' => '左', + 'right' => '正しい', + 'active' => 'アクティブ', + 'custom' => 'カスタム', + 'inactive' => '非活性', + 'image-alignment' => '画像の配置', + 'icon-status' => 'カテゴリアイコンステータス', + 'image-status' => 'カテゴリー画像ステータス', + 'sub-category-show' => 'サブカテゴリーを表示', + 'image-height' => '画像の高さ（ピクセル単位）', + 'image-width' => '画像の幅[ピクセル単位]', + 'show-tooltip' => 'カテゴリのツールチップを表示', + 'num-sub-category' => 'サブカテゴリーの数', ] ], + 'layouts' => [ - 'velocity' => 'Velocity', - 'cms-pages' => 'CMS Pages', - 'meta-data' => 'Meta Data', - 'category-menu' => 'Category Menu', - 'header-content' => 'Header Content', + 'velocity' => '速度', + 'cms-pages' => 'CMSページ', + 'meta-data' => 'メタデータ', + 'category-menu' => 'カテゴリーメニュー', + 'header-content' => 'ヘッダーコンテンツ', ], + 'contents' => [ - 'self' => 'Self', - 'active' => 'Active', - 'new-tab' => 'New Tab', - 'inactive' => 'Inactive', - 'title' => 'Content List', - 'select' => '-- Select --', - 'add-title' => 'Add Content', - 'btn-add-content' => 'Add Content', - 'save-btn-title' => 'Save Content', - 'autocomplete' => '[Autocomplete]', - 'no-result-found' => 'No record found.', - 'search-hint' => 'Search product here...', - 'mass-delete-success' => 'Selected content deleted successfully.', - 'tab' => [ - 'page' => 'Page Setting', - 'content' => 'Content Setting', - 'meta_content' => 'Meta Data', + 'self' => '自己', + 'active' => 'アクティブ', + 'new-tab' => '新しいタブ', + 'inactive' => '非活性', + 'title' => 'コンテンツリスト', + 'select' => '- 選択する -', + 'add-title' => 'コンテンツを追加', + 'btn-add-content' => 'コンテンツを追加', + 'save-btn-title' => 'コンテンツを保存', + 'autocomplete' => '[オートコンプリート]', + 'no-result-found' => 'レコードが見つかりません。', + 'search-hint' => 'ここで製品を検索...', + 'mass-delete-success' => '選択したコンテンツは正常に削除されました。', + 'tab' => [ + 'page' => 'ページ設定', + 'content' => 'コンテンツ設定', + 'meta_content' => 'メタデータ', ], - 'page' => [ - 'title' => 'Title', - 'status' => 'Status', - 'position' => 'Position', + 'page' => [ + 'title' => '題名', + 'status' => '状態', + 'position' => 'ポジション', ], - 'content' => [ - 'content-type' => 'Content Type', - 'custom-title' => 'Custom Title', - 'category-slug' => 'Category Slug', - 'link-target' => 'Page Link Target', - 'custom-product' => 'Store Products', - 'custom-heading' => 'Custom Heading', - 'catalog-type' => 'Product Catalog Type', - 'static-description' => 'Content Description', - 'page-link' => 'Page Link [e.g. http://example.com/../../]', + 'content' => [ + 'content-type' => 'コンテンツタイプ', + 'custom-title' => 'カスタムタイトル', + 'category-slug' => 'カテゴリースラッグ', + 'link-target' => 'ページリンクターゲット', + 'custom-product' => 'ストア製品', + 'custom-heading' => 'カスタム見出し', + 'catalog-type' => '製品カタログのタイプ', + 'static-description' => 'コンテンツの説明', + 'page-link' => 'ページリンク[例： http://example.com/../../]', ], - 'datagrid' => [ - 'id' => 'Id', - 'title' => 'Title', - 'status' => 'Status', - 'position' => 'Position', - 'content-type' => 'Content Type', + 'datagrid' => [ + 'id' => 'Id', + 'title' => '題名', + 'status' => '状態', + 'position' => 'ポジション', + 'content-type' => 'コンテンツタイプ', ] ], + 'meta-data' => [ - 'footer' => 'Footer', - 'title' => 'Velocity meta data', - 'activate-slider' => 'Activate Slider', - 'home-page-content' => 'Home Page Content', - 'footer-left-content' => 'Footer Left Content', - 'subscription-content' => 'Subscription bar Content', - 'sidebar-categories' => 'Sidebar Categories', - 'header_content_count' => 'Header Content Count', - 'footer-left-raw-content' => '

We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.

', - 'slider-path' => 'Slider Path', - 'category-logo' => 'Category logo', - 'product-policy' => 'Product Policy', - 'update-meta-data' => 'Update Meta Data', - 'product-view-image' => 'Product View Image', - 'advertisement-two' => 'Advertisement Two Images', - 'advertisement-one' => 'Advertisement One Images', - 'footer-middle-content' => 'Footer Middle Content', - 'advertisement-four' => 'Advertisement Four Images', - 'advertisement-three' => 'Advertisement Three Images', - 'images' => 'Images', - 'general' => 'General', - 'add-image-btn-title' => 'Add Image' + 'footer' => 'フッター', + 'title' => '速度メタデータ', + 'activate-slider' => 'スライダーをアクティブにする', + 'home-page-content' => 'ホームページコンテンツ', + 'footer-left-content' => 'フッター左コンテンツ', + 'subscription-content' => 'サブスクリプションバーのコンテンツ', + 'sidebar-categories' => 'サイドバーのカテゴリ', + 'header_content_count' => 'ヘッダーコンテンツ数', + 'footer-left-raw-content' => '

私たちはソフトウェアを作成し、バイナリで現実世界の問題を解決するのが大好きです。私達は私達の目標に非常にコミットしています。私たちはリソースを投資して、最先端のテクノロジーの専門知識を活用し、一流のエンタープライズビジネス向けの使いやすいソフトウェアとアプリケーションを作成します。

', + 'slider-path' => 'スライダーパス', + 'category-logo' => 'カテゴリーロゴ', + 'product-policy' => '製品ポリシー', + 'update-meta-data' => 'メタデータを更新', + 'product-view-image' => '製品ビュー画像', + 'advertisement-two' => '広告2つの画像', + 'advertisement-one' => '広告1つの画像', + 'footer-middle-content' => 'フッターミドルコンテンツ', + 'advertisement-four' => '広告4つの画像', + 'advertisement-three' => '広告3つの画像', + 'images' => '画像', + 'general' => '一般的な', + 'add-image-btn-title' => '画像を追加' ], + 'category' => [ - 'save-btn-title' => 'Save Menu', - 'title' => 'Category Menu List', - 'add-title' => 'Add Menu Content', - 'edit-title' => 'Edit Menu Content', - 'btn-add-category' => 'Add Category Content', - 'datagrid' => [ - 'category-id' => 'Category Id', - 'category-name' => 'Category Name', - 'category-icon' => 'Category Icon', - 'category-status' => 'Status', + 'save-btn-title' => '保存メニュー', + 'title' => 'カテゴリーメニュー一覧', + 'add-title' => 'メニューコンテンツを追加', + 'edit-title' => 'メニューコンテンツの編集', + 'btn-add-category' => 'カテゴリコンテンツを追加', + 'datagrid' => [ + 'category-id' => 'カテゴリID', + 'category-name' => '種別名', + 'category-icon' => 'カテゴリーアイコン', + 'category-status' => '状態', ], - 'tab' => [ - 'general' => 'General', + 'tab' => [ + 'general' => '一般的な', ], - 'status' => 'Status', - 'active' => 'Active', - 'inactive' => 'Inactive', - 'select' => '-- Select --', - 'icon-class' => 'Icon Class', - 'select-category' => 'Choose Category', - 'tooltip-content' => 'Tooltip Content', - 'mass-delete-success' => 'Selected categories menu deleted successfully.', + 'status' => '状態', + 'active' => 'アクティブ', + 'inactive' => '非活性', + 'select' => '- 選択する -', + 'icon-class' => 'アイコンクラス', + 'select-category' => 'カテゴリーを選択', + 'tooltip-content' => 'ツールチップの内容', + 'mass-delete-success' => '選択したカテゴリメニューを削除しました。', ], + 'general' => [ - 'locale_logo' => 'Locale Logo', + 'locale_logo' => 'ロケールロゴ', ], ], - 'home' => [ - 'view-all' => 'View All', - 'add-to-cart' => 'Add To Cart', - 'hot-categories' => 'Hot Categories', - 'payment-methods' => 'Payment Methods', - 'customer-reviews' => 'Customer Reviews', - 'shipping-methods' => 'Shipping Methods', - 'popular-categories' => 'Popular Categories', + 'home' => [ + 'view-all' => 'すべてを見る', + 'add-to-cart' => 'カートに追加', + 'hot-categories' => '人気のカテゴリ', + 'payment-methods' => 'お支払い方法', + 'customer-reviews' => 'カスタマーレビュー', + 'shipping-methods' => '輸送方法', + 'popular-categories' => '人気のカテゴリー', ], - 'header' => [ - 'cart' => 'Cart', - 'cart' => 'Cart', - 'guest' => 'Guest', - 'logout' => 'Logout', - 'title' => 'Account', - 'account' => 'Account', - 'profile' => 'Profile', - 'wishlist' => 'Wishlist', - 'all-categories' => 'All Categories', - 'search-text' => 'Search products here', - 'welcome-message' => 'Welcome, :customer_name', - 'dropdown-text' => 'Manage Cart, Orders & Wishlist', + 'header' => [ + 'cart' => 'カート', + 'guest' => 'ゲスト', + 'logout' => 'ログアウト', + 'title' => 'アカウント', + 'account' => 'アカウント', + 'profile' => 'プロフィール', + 'wishlist' => 'ウィッシュリスト', + 'all-categories' => 'すべてのカテゴリ', + 'search-text' => 'ここで製品を検索', + 'welcome-message' => 'ようこそ、:customer_name', + 'dropdown-text' => 'カート、注文、ウィッシュリストを管理する', ], - 'menu-navbar' => [ - 'text-more' => 'More', - 'text-category' => 'Shop by Category', + 'menu-navbar' => [ + 'text-more' => 'もっと', + 'text-category' => 'カテゴリーで選ぶ', ], - 'minicart' => [ - 'cart' => 'Cart', - 'view-cart' => 'View Cart', + 'minicart' => [ + 'cart' => 'カート', + 'view-cart' => 'カート', ], - 'checkout' => [ - 'qty' => 'Qty', - 'checkout' => 'Checkout', + 'checkout' => [ + 'qty' => '数量', + 'checkout' => 'チェックアウト', 'cart' => [ - 'view-cart' => 'View Cart', - 'cart-summary' => 'Cart Summary', + 'view-cart' => 'かごの中身を見る', + 'cart-summary' => 'カートの概要', ], - 'qty' => 'Qty', - 'items' => 'Items', - 'subtotal' => 'Subtotal', - 'sub-total' => 'Sub Total', - 'proceed' => 'Proceed to checkout', + 'qty' => '数量', + 'items' => 'アイテム', + 'subtotal' => '小計', + 'sub-total' => '小計', + 'proceed' => 'チェックアウトに進む', ], - 'customer' => [ + 'customer' => [ 'compare' => [ 'text' => '比較する', 'compare_similar_items' => '類似アイテムを比較する', @@ -200,85 +202,84 @@ return [ 'already_added' => 'アイテムは比較リストに既に追加されています', 'removed' => '比較リストからアイテムを削除しました', 'empty-text' => "比較リストにアイテムがありません", - 'product_image' => 'Product Image', - 'actions' => 'Actions', + 'product_image' => '商品画像', + 'actions' => '行動', ], 'login-form' => [ - 'sign-up' => 'Sign up', - 'new-customer' => 'New Customer', - 'customer-login' => 'Customer Login', - 'registered-user' => 'Registered User', - 'your-email-address' => 'Your email address', - 'form-login-text' => 'If you have an account, sign in with your email address.', + 'sign-up' => 'サインアップ', + 'new-customer' => '新規のお客様', + 'customer-login' => 'お客様ログイン', + 'registered-user' => '登録ユーザー', + 'your-email-address' => 'メールアドレス', + 'form-login-text' => 'アカウントをお持ちの場合は、メールアドレスでログインしてください。', ], 'signup-form' => [ - 'login' => 'Login', - 'become-user' => 'Become User', - 'user-registration' => 'User Registration', - 'form-sginup-text' => 'If you are new to our store, we glad to have you as member.', + 'login' => 'ログインする', + 'become-user' => 'ユーザーになる', + 'user-registration' => 'ユーザー登録', + 'form-sginup-text' => 'あなたが私たちの店に初めている場合は、メンバーとして喜んでいます。', ], 'forget-password' => [ - 'login' => 'Login', - 'forgot-password' => 'Forgot Password', - 'recover-password' => 'Recover Password', - 'recover-password-text' => 'If you forgot your password, recover it by entering your email address.', + 'login' => 'ログインする', + 'forgot-password' => 'パスワードをお忘れですか', + 'recover-password' => 'パスワードを回復', + 'recover-password-text' => 'パスワードを忘れた場合は、メールアドレスを入力してパスワードを回復してください。', ] ], - 'error' => [ - 'go-to-home' => 'Go to home', - 'page-lost-short' => 'Page lost content', - 'something_went_wrong' => 'something went wrong', - 'page-lost-description' => "The page you're looking for isn't available. Try to search again or use the Go Back button below.", + 'error' => [ + 'go-to-home' => '家に帰る', + 'page-lost-short' => 'ページが失われたコンテンツ', + 'something_went_wrong' => '問題が発生しました', + 'page-lost-description' => "お探しのページはご利用いただけません。もう一度検索するか、下の[戻る]ボタンを使用してください。", ], - 'products' => [ - 'text' => 'Products', - 'details' => 'Details', - 'reviews-title' => 'Reviews', - 'reviewed' => 'Reviewed', - 'review-by' => 'Review by', - 'quick-view' => 'Quick View', - 'not-available' => 'Not Available', - 'submit-review' => 'Submit Review', - 'ratings' => ':totalRatings Ratings', - 'reviews-count' => ':totalReviews Reviews', - 'customer-rating' => 'Customer Rating', - 'more-infomation' => 'More Information', - 'view-all-reviews' => 'View All Reviews', - 'write-your-review' => 'Write Your Review', - 'short-description' => 'Short Descriptions', - 'recently-viewed' => 'Recently Viewed Products', - 'be-first-review' => 'Be the first to write a review', + 'products' => [ + 'text' => '製品', + 'details' => '細部', + 'reviews-title' => 'レビュー', + 'reviewed' => '審査', + 'review-by' => 'によるレビュー', + 'quick-view' => 'クイックビュー', + 'not-available' => '利用不可', + 'submit-review' => 'レビュー送信', + 'ratings' => ':totalRatings 評価', + 'reviews-count' => ':totalReviews レビュー', + 'customer-rating' => 'お客様の評価', + 'more-infomation' => '詳しくは', + 'view-all-reviews' => 'すべてのレビューを表示', + 'write-your-review' => 'レビューを書く', + 'short-description' => '短い説明', + 'recently-viewed' => '最近見た製品', + 'be-first-review' => '最初のレビューを書く', ], - 'shop' => [ + 'shop' => [ 'gender' => [ - 'male' => 'Male', - 'other' => 'Other', - 'female' => 'Female', + 'male' => '男性', + 'other' => 'その他の', + 'female' => '女性', ], 'general' => [ - 'no' => 'No', - 'yes' => 'Yes', - 'view' => 'View', - 'filter' => 'Filter', - 'orders' => 'Orders', - 'update' => 'Update', - 'reviews' => 'Reviews', - 'currencies' => 'Currencies', - 'addresses' => 'Addresses', - 'top-brands' => 'Top Brands', - 'new-password' => 'New password', - 'downloadables' => 'Downloadable Products', - 'confirm-new-password' => 'Confirm new password', - 'enter-current-password' => 'Enter your current password', - + 'no' => '番号', + 'yes' => 'はい', + 'view' => '見る', + 'filter' => 'フィルタ', + 'orders' => '注文', + 'update' => '更新', + 'reviews' => 'レビュー', + 'currencies' => '通貨', + 'addresses' => '住所', + 'top-brands' => 'トップブランド', + 'new-password' => '新しいパスワード', + 'downloadables' => 'ダウンロード可能な製品', + 'confirm-new-password' => '新しいパスワードを確認', + 'enter-current-password' => '現在のパスワードを入力してください', 'alert' => [ - 'info' => 'Info', - 'error' => 'Error', - 'success' => 'Success', - 'warning' => 'Warning', + 'info' => '情報', + 'error' => 'エラー', + 'success' => '成功', + 'warning' => '警告', ], ], 'wishlist' => [ @@ -287,13 +288,11 @@ return [ ] ], - 'responsive' => [ + 'responsive' => [ 'header' => [ - 'done' => 'Done', - 'languages' => 'Languages', - 'greeting' => 'Welcome, :customer !', + 'done' => 'できた', + 'languages' => '言語', + 'greeting' => 'ようこそ、:customer !', ] ], -] - -?> +]; From 7a3fd15b11118b3644b2d57e3b29310ecc263951 Mon Sep 17 00:00:00 2001 From: Devansh Date: Sat, 8 Aug 2020 12:48:02 +0530 Subject: [PATCH 02/14] From Shop Velocity Lang Dependencies Removed And Added That Language Translation To Shop Lang --- packages/Webkul/Shop/src/Config/menu.php | 2 +- .../customers/account/compare/index.blade.php | 2 +- .../guest/compare/compare-products.blade.php | 16 ++++++++-------- .../views/guest/compare/index.blade.php | 2 +- .../views/layouts/header/index.blade.php | 8 ++++---- .../Resources/views/products/compare.blade.php | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/Webkul/Shop/src/Config/menu.php b/packages/Webkul/Shop/src/Config/menu.php index 1245e6413..2212482b1 100755 --- a/packages/Webkul/Shop/src/Config/menu.php +++ b/packages/Webkul/Shop/src/Config/menu.php @@ -28,7 +28,7 @@ return [ 'sort' => 4, ], [ 'key' => 'account.compare', - 'name' => 'velocity::app.customer.compare.text', + 'name' => 'shop::app.customer.compare.text', 'route' =>'velocity.customer.product.compare', 'sort' => 5, ], [ diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php index 8a0231299..7b6de5e66 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php @@ -3,7 +3,7 @@ @include('shop::guest.compare.compare-products') @section('page_title') - {{ __('velocity::app.customer.compare.compare_similar_items') }} + {{ __('shop::app.customer.compare.compare_similar_items') }} @endsection @section('content-wrapper') diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index e47babc32..6d907e9cf 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -7,7 +7,7 @@ diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php index cbe3ab1e3..4d5c1a356 100755 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php @@ -93,7 +93,6 @@ class Controller extends BaseController * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository * @param \Webkul\Velocity\Repositories\Product\ProductRepository $velocityProductRepository * @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository - * @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository * * @return void */ From 441740d7a2befc9ed82e9e4208e643892db737d7 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Tue, 11 Aug 2020 15:50:04 +0530 Subject: [PATCH 14/14] #3720 --- .../views/settings/channels/edit.blade.php | 2 +- packages/Webkul/Theme/src/Themes.php | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php index 2af28bc03..e3b9a3506 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -154,7 +154,7 @@ theme ?>