From 4542ea6371b01262da9209e5fcbcd690dbd69d62 Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 9 May 2017 21:05:27 +0200 Subject: [PATCH 01/27] Added Backend-Translations --- publishable/lang/voyager.php | 335 ++++++++++++++++++ resources/views/bread/browse.blade.php | 27 +- resources/views/bread/edit-add.blade.php | 27 +- .../partials/relationship-edit-add.blade.php | 4 +- resources/views/bread/read.blade.php | 8 +- resources/views/dashboard/navbar.blade.php | 12 +- resources/views/dashboard/sidebar.blade.php | 2 +- resources/views/formfields/date.blade.php | 3 +- resources/views/formfields/number.blade.php | 2 +- resources/views/formfields/password.blade.php | 4 +- .../formfields/select_dropdown.blade.php | 4 +- .../formfields/select_multiple.blade.php | 4 +- resources/views/index.blade.php | 30 +- resources/views/login.blade.php | 24 +- resources/views/media/index.blade.php | 79 ++--- resources/views/menu/admin.blade.php | 6 +- resources/views/menus/browse.blade.php | 18 +- resources/views/menus/builder.blade.php | 62 ++-- .../views/menus/partial/notice.blade.php | 4 +- resources/views/partials/app-footer.blade.php | 4 +- resources/views/posts/browse.blade.php | 21 +- resources/views/posts/edit-add.blade.php | 42 +-- resources/views/profile.blade.php | 2 +- resources/views/roles/edit-add.blade.php | 12 +- resources/views/settings/index.blade.php | 62 ++-- .../tools/database/edit-add-bread.blade.php | 86 ++--- .../views/tools/database/index.blade.php | 56 ++- .../vue-components/database-column.blade.php | 12 +- .../database-table-editor.blade.php | 56 +-- .../database-table-helper-buttons.blade.php | 6 +- .../vue-components/database-types.blade.php | 4 +- resources/views/users/browse.blade.php | 31 +- resources/views/users/edit-add.blade.php | 24 +- resources/views/users/read.blade.php | 4 +- src/Commands/InstallCommand.php | 6 + .../Controllers/VoyagerBreadController.php | 13 +- src/Http/Controllers/VoyagerController.php | 6 +- .../Controllers/VoyagerDatabaseController.php | 22 +- .../Controllers/VoyagerMediaController.php | 28 +- .../Controllers/VoyagerMenuController.php | 6 +- .../Controllers/VoyagerRoleController.php | 4 +- .../Controllers/VoyagerSettingsController.php | 16 +- src/Models/DataType.php | 19 +- src/Traits/AlertsMessages.php | 2 +- src/VoyagerServiceProvider.php | 14 +- src/Widgets/PageDimmer.php | 6 +- src/Widgets/PostDimmer.php | 6 +- src/Widgets/UserDimmer.php | 6 +- tests/DashboardTest.php | 8 +- tests/LoginTest.php | 4 +- tests/RolesTest.php | 8 +- tests/UserProfileTest.php | 8 +- 52 files changed, 792 insertions(+), 467 deletions(-) create mode 100644 publishable/lang/voyager.php diff --git a/publishable/lang/voyager.php b/publishable/lang/voyager.php new file mode 100644 index 0000000000..c5f135790f --- /dev/null +++ b/publishable/lang/voyager.php @@ -0,0 +1,335 @@ + 'Last Year', + 'date_this_year' => 'This Year', + 'date_last_week' => 'Last Week', + 'date_this_week' => 'This Week', + + //Generic + 'generic_email' => 'E-mail', + 'generic_password' => 'Password', + 'generic_login' => 'Login', + 'generic_dashboard' => 'Dashboard', + 'generic_profile' => 'Profile', + 'generic_settings' => 'Settings', + 'generic_options' => 'Options', + 'generic_media' => 'Media', + 'generic_builder' => 'Builder', + 'generic_menu_builder' => 'Menu Builder', + 'generic_permissions' => 'Permissions', + 'generic_database' => 'Database', + 'generic_keep_sidebar_open' => 'Yarr! Drop the anchors! (and keep the sidebar open)', + 'generic_unstick_sidebar' => 'Unstick the sidebar', + 'generic_how_to_use' => 'How To Use', + 'generic_new' => 'New', + 'generic_add_new' => 'Add New', + 'generic_name' => 'Name', + 'generic_key' => 'Key', + 'generic_title' => 'Title', + 'generic_route' => 'Route', + 'generic_url' => 'URL', + 'generic_update' => 'Update', + 'generic_type' => 'Type', + 'generic_choose_type' => 'Choose Type', + 'generic_browse' => 'Browse', + 'generic_action' => 'Action', + 'generic_actions' => 'Actions', + 'generic_featured' => 'Featured', + 'generic_are_you_sure' => 'Are you sure', + 'generic_are_you_sure_delete' => 'Are you sure you want to delete', + 'generic_delete_confirm' => 'Yes, Delete it!', + 'generic_delete_this_confirm' => 'Yes, Delete This', + 'generic_delete_question' => 'Are you sure you want to delete this', + 'generic_delete' => 'Delete', + 'generic_cancel' => 'Cancel', + 'generic_close' => 'Close', + 'generic_edit' => 'Edit', + 'generic_view' => 'View', + 'generic_viewing' => 'Viewing', + 'generic_save' => 'Save', + 'generic_read' => 'Read', + 'generic_rename' => 'Rename', + 'generic_upload' => 'Upload', + 'generic_move' => 'Move', + 'generic_add_folder' => 'Add Folder', + 'generic_return_to_list' => 'Return to List', + 'generic_custom' => 'Custom', + 'generic_items' => 'item(s)', + 'generic_public_url' => 'Public URL', + 'generic_click_here' => 'Click Here', + 'generic_last_modified' => 'Last modified', + 'generic_all_done' => 'All done', + 'generic_select_all' => 'Select All', + 'generic_deselect_all' => 'Deselect All', + 'generic_submit' => 'Submit', + 'generic_required' => 'Required', + 'generic_yes' => 'Yes', + 'generic_no' => 'No', + 'generic_yes_please' => 'Yes, Please', + 'generic_no_thanks' => 'No Thanks', + 'generic_add' => 'Add', + 'generic_timestamp' => 'Timestamp', + 'generic_showing_entries' => 'Showing :from to :to of :all entrie|Showing :from to :to of :all entries', + 'generic_length' => 'Length', + 'generic_not_null' => 'Not Null', + 'generic_unsigned' => 'Unsigned', + 'generic_auto_increment' => 'Auto Increment', + 'generic_index' => 'Index', + 'generic_default' => 'Default', + 'generic_email' => 'E-mail', + 'generic_created_at' => 'Created at', + 'generic_exception' => 'Exception', + 'generic_successfully_updated' => 'Successfully Updated', + 'generic_update_failed' => 'Update Failed', + 'generic_successfully_added_new' => 'Successfully Added New', + 'generic_successfully_deleted' => 'Successfully Deleted', + 'generic_error_deleting' => 'Sorry it appears there was a problem deleting this', + 'generic_internal_error' => 'Internal error', + 'generic_field_does_not_exist' => 'Field does not exist', + + //Login + 'login_welcome' => 'Welcome to Voyager. The Missing Admin for Laravel', + 'login_signin_below' => 'Sign In Below:', + 'login_loginin' => 'Loggin in', + + //Profile + 'profile_edit' => 'Edit My Profile', + 'profile_avatar' => 'Avatar', + 'profile_role' => 'Role', + 'profile_user_role' => 'User Role', + 'profile_password' => 'Password', + 'profile_password_hint' => 'Leave empty to keep the same', + + //Settings + 'settings_usage_help' => 'You can get the value of each setting anywhere on your site by calling', + 'settings_save' => 'Save Settings', + 'settings_new' => 'New Setting', + 'settings_help_name' => 'Setting name ex: Admin Title', + 'settings_help_key' => 'Setting key ex: admin_title', + 'settings_help_option' => '(optional, only applies to certain types like dropdown box or radio button)', + 'settings_add_new' => 'Add New Setting', + 'settings_delete_question' => 'Are you sure you want to delete the :setting Setting?', + 'settings_delete_confirm' => 'Yes, Delete This Setting', + 'settings_successfully_created' => 'Successfully Created Settings', + 'settings_successfully_saved' => 'Successfully Saved Settings', + 'settings_successfully_deleted' => 'Successfully Deleted Setting', + 'settings_already_at_top' => 'This is already at the top of the list', + 'settings_already_at_bottom' => 'This is already at the bottom of the list', + 'settings_moved_order_up' => 'Moved :name setting order up', + 'settings_moved_order_down' => 'Moved :name setting order down', + 'settings_successfully_removed' => 'Successfully removed :name value', + + //Media + 'media_library' => 'Media Library', + 'media_no_files_in_folder' => 'No files in this folder.', + 'media_no_files_here' => 'No files here.', + 'media_loading' => 'LOADING YOUR MEDIA FILES', + 'media_nothing_selected' => 'No file or folder selected', + 'media_video_support' => 'Your browser does not support the video tag.', + 'media_audio_support' => 'Your browser does not support the audio element.', + 'media_move_file_folder' => 'Move File/Folder', + 'media_destination_folder' => 'Destination Folder', + 'media_rename_file_folder' => 'Rename File/Folder', + 'media_new_file_folder' => 'New File/Folder Name', + 'media_add_new_folder' => 'Add New Folder', + 'media_create_new_folder' => 'Create New Folder', + 'media_delete_folder_question' => 'Deleting a folder will remove all files and folders contained inside', + 'media_drag_drop_info' => 'Drag and drop files or click below to upload', + 'media_new_folder_name' => 'New Folder Name', + 'media_error_uploading' => 'Upload Fail: Unknown error occurred!', + 'media_uploading_wrong_type' => 'Upload Fail: Unsupported file format or It is too large to upload!', + 'media_success_uploading' => 'Image successfully uploaded!', + 'media_folder_exists_already' => 'Sorry that folder already exists, please delete that folder if you wish to re-create it', + 'media_error_creating_dir' => 'Sorry something seems to have gone wrong with creating the directory, please check your permissions', + 'media_error_deleting_folder' => 'Sorry something seems to have gone wrong when deleting this folder, please check your permissions', + 'media_error_deleting_file' => 'Sorry something seems to have gone wrong deleting this file, please check your permissions', + 'media_error_moving' => 'Sorry there seems to be a problem moving that file/folder, please make sure you have the correct permissions.', + 'media_error_already_exists' => 'Sorry there is already a file/folder with that existing name in that folder.', + 'media_error_may_exist' => 'File or Folder may already exist with that name. Please choose another name or delete the other file.', + 'media_success_uploaded_file' => 'Successfully uploaded new file!', + 'media_image_does_not_exist' => 'Image does not exist', + 'media_image_removed' => 'Image removed', + + //Menu Builder + 'menu_builder_new_menu_item' => 'New Menu Item', + 'menu_builder_drag_drop_info' => 'Drag and drop the menu Items below to re-arrange them.', + 'menu_builder_delete_item_question' => 'Are you sure you want to delete this menu item?', + 'menu_builder_delete_item_confirm' => 'Yes, Delete This Menu Item', + 'menu_builder_create_new_item' => 'Create a New Menu Item', + 'menu_builder_edit_item' => 'Edit Menu Item', + 'menu_builder_item_title' => 'Title of the Menu Item', + 'menu_builder_link_type' => 'Link type', + 'menu_builder_static_url' => 'Static URL', + 'menu_builder_dynamic_route' => 'Dynamic Route', + 'menu_builder_url' => 'URL for the Menu Item', + 'menu_builder_item_route' => 'Route for the menu item', + 'menu_builder_route_parameter' => 'Route parameters (if any)', + 'menu_builder_icon_class' => 'Font Icon class for the Menu Item (Use a', + 'menu_builder_icon_class2' => 'Voyager Font Class)', + 'menu_builder_icon_class_ph' => 'Icon Class (optional)', + 'menu_builder_color' => 'Color in RGB or hex (optional)', + 'menu_builder_color_ph' => 'Color (ex. #ffffff or rgb(255, 255, 255)', + 'menu_builder_open_in' => 'Open In', + 'menu_builder_open_same' => 'Same Tab/Window', + 'menu_builder_open_new' => 'New Tab/Window', + 'menu_builder_updated_order' => 'Successfully updated menu order.', + 'menu_builder_usage_hint' => 'You can output a menu anywhere on your site by calling|You can output this menu anywhere on your site by calling', + 'menu_builder_successfully_deleted' => 'Successfully Deleted Menu Item.', + 'menu_builder_successfully_created' => 'Successfully Created New Menu Item.', + 'menu_builder_successfully_updated' => 'Successfully Updated Menu Item.', + + //Posts + 'post_title' => 'Post Title', + 'post_title_sub' => 'The title for your post', + 'post_content' => 'Post Content', + 'post_excerpt' => 'Excerpt Small description of this post', + 'post_details' => 'Post Details', + 'post_slug' => 'URL slug', + 'post_status' => 'Post Status', + 'post_status_published' => 'published', + 'post_status_draft' => 'draft', + 'post_status_pending' => 'pending', + 'post_category' => 'Post Category', + 'post_image' => 'Post Image', + 'post_seo_content' => 'SEO Content', + 'post_meta_description' => 'Meta Description', + 'post_meta_keywords' => 'Meta Keywords', + 'post_seo_title' => 'Seo Title', + 'post_update' => 'Update Post', + 'post_new' => 'Create New Post', + + //Database + 'database_create_new_table' => 'Create New Table', + 'database_create_your_new_table' => 'Create Your New Table', + 'database_table_name' => 'Table Name', + 'database_bread_crud_actions' => 'BREAD/CRUD Actions', + 'database_table_actions' => 'Table Actions', + 'database_edit_bread' => 'Edit BREAD', + 'database_delete_bread' => 'Delete BREAD', + 'database_add_bread' => 'Add BREAD to this table', + 'database_delete_table_bread_quest' => 'Are you sure you want to delete the BREAD for the :table table?', + 'database_delete_table_bread_conf' => 'Yes, remove the BREAD', + 'database_delete_table_question' => 'Are you sure you want to delete the :table table?', + 'database_delete_table_confirm' => 'Yes, delete this table', + 'database_field' => 'Field', + 'database_type' => 'Type', + 'database_null' => 'Null', + 'database_key' => 'Key', + 'database_default' => 'Default', + 'database_extra' => 'Extra', + 'database_delete_bread_before_table'=> 'Please make sure to remove the BREAD on this table before deleting the table.', + 'database_create_bread_for_table' => 'Create BREAD for :table table', + 'database_edit_bread_for_table' => 'Edit BREAD for :table table', + 'database_success_created_bread' => 'Successfully created new BREAD', + 'database_error_creating_bread' => 'Sorry it appears there may have been a problem creating this BREAD', + 'database_success_update_bread' => 'Successfully updated the :datatype BREAD', + 'database_error_updating_bread' => 'Sorry it appears there may have been a problem updating this BREAD', + 'database_success_remove_bread' => 'Successfully removed BREAD from :datatype', + 'database_error_removing_bread' => 'Sorry it appears there was a problem removing this BREAD', + 'database_edit_table' => 'Edit the :table table below', + 'database_bread_info' => 'BREAD info', + 'database_display_name_singular' => 'Display Name (Singular)', + 'database_display_name_plural' => 'Display Name (Plural)', + 'database_url_slug' => 'URL Slug (must be unique)', + 'database_url_slug_ph' => 'URL slug (ex. posts)', + 'database_icon_hint' => 'Icon (optional) Use a', + 'database_icon_hint2' => 'Voyager Font Class', + 'database_icon_class' => 'Icon to use for this Table', + 'database_model_name' => 'Model Name', + 'database_model_name_ph' => 'ex. \App\User, if left empty will try and use the table name', + 'database_model_class' => 'Model Class Name', + 'database_controller_name' => 'Controller Name', + 'database_controller_name_hint' => 'ex. PageController, if left empty will use the BREAD Controller', + 'database_generate_permissions' => 'Generate Permissions', + 'database_server_pagination' => 'Server-side Pagination', + 'database_description' => 'Description', + 'database_edit_rows' => 'Edit the rows for the :table table below', + 'database_visibility' => 'Visibility', + 'database_input_type' => 'Input Type', + 'database_display_name' => 'Display Name', + 'database_optional_details' => 'Optional Details', + 'database_index' => 'INDEX', + 'database_unique' => 'UNIQUE', + 'database_primary' => 'PRIMARY', + 'database_composite_warning' => 'Warning: this column is part of a composite index', + 'database_name_warning' => 'Please name the column before adding an index', + 'database_create_model_table' => 'Create model for this table?', + 'database_create_migration' => 'Create migration for this table?', + 'database_table_columns' => 'Table Columns', + 'database_no_composites_warning' => 'This table has composite indexes. Please note that they are not supported at the moment. Be careful when trying to add/remove indexes.', + 'database_table_no_columns' => 'The table has no columns...', + 'database_update_table' => 'Update Table', + 'database_column' => 'Column', + 'database_already_exists' => 'already exists', + 'database_table_has_index' => 'The table already has a primary index.', + 'database_unknown_type' => 'Unknown Type', + 'database_type_not_supported' => 'This type is not supported', + 'database_add_new_column' => 'Add New Column', + 'database_add_timestamps' => 'Add Timestamps', + 'database_add_softdeletes' => 'Add Soft Deletes', + 'database_field_safe_failed' => 'Failed to save field :field, we\'re rolling back!', + 'database_success_create_table' => 'Successfully created :table table', + 'database_success_delete_table' => 'Successfully deleted :table table' + 'database_edit_table_not_exist' => 'The table you want to edit doesn\'t exist', + + //Dimmer + 'dimmer_page' => 'Page|Pages', + 'dimmer_page_text' => 'You have :count :string in your database. Click on button below to view all pages.', + 'dimmer_page_link_text' => 'View all pages', + 'dimmer_post' => 'Post|Posts', + 'dimmer_post_text' => 'You have :count :string in your database. Click on button below to view all posts.', + 'dimmer_post_link_text' => 'View all posts', + 'dimmer_user' => 'User|User', + 'dimmer_user_text' => 'You have :count :string in your database. Click on button below to view all users.', + 'dimmer_user_link_text' => 'View all users', + + //Form types + 'form_type_textbox' => 'Text Box', + 'form_type_textarea' => 'Text Area', + 'form_type_richtextbox' => 'Rich Textbox', + 'form_type_codeeditor' => 'Code Editor', + 'form_type_checkbox' => 'Check Box', + 'form_type_radiobutton' => 'Radio Button', + 'form_type_selectdropdown' => 'Select Dropdown', + 'form_type_file' => 'File', + 'form_type_image' => 'Image', + + //Form fields + 'form_field_password_keep' => 'Leave empty to keep the same', + 'form_field_select_dd_relationship' => 'Make sure to setup the appropriate relationship in the :method method of the :class class.', + + //Theme + 'theme_footer_copyright' => 'Made with by', + 'theme_footer_copyright2' => 'Made with rum and even more rum', + + //JSON + 'json_valid' => 'Valid Json', + 'json_invalid' => 'Invalid Json', + 'json_invalid_message' => 'Seems like you introduced some invalid JSON.', + 'json_validation_errors' => 'Validation errors', + + // Google Analytics + 'analytics_no_client_id' => 'To view analytics you\'ll need to get a google analytics client id and add it to your settings for the key google_analytics_client_id. Get your key in your Google developer console:', + 'analytics_set_view' => 'Select a View', + 'analytics_various_visualizations' => 'Various visualizations', + 'analytics_this_vs_last_week' => 'This Week vs Last Week', + 'analytics_this_vs_last_year' => 'This Year vs Last Year', + 'analytics_by_users' => 'By users', + 'analytics_by_pageview' => 'By pageview', + 'analytics_by_sessions' => 'By sessions', + 'analytics_top_browsers' => 'Top Browsers', + 'analytics_top_countries' => 'Top Countries', + + //Errors + 'error_symlink_missing_title' => 'Missing storage symlink', + 'error_symlink_missing_text' => 'We could not find a storage symlink. This could cause problems with loading media files from the browser.', + 'error_symlink_missing_button' => 'Fix it', + 'error_symlink_created_title' => 'Missing storage symlink created', + 'error_symlink_created_text' => 'We just created the missing symlink for you.', + 'error_symlink_failed_title' => 'Could not create missing storage symlink', + 'error_symlink_failed_text' => 'We failed to generate the missing symlink for your application. It seems like your hosting provider does not support it.', + + +]; diff --git a/resources/views/bread/browse.blade.php b/resources/views/bread/browse.blade.php index 0f3f3ab998..626785ae55 100644 --- a/resources/views/bread/browse.blade.php +++ b/resources/views/bread/browse.blade.php @@ -7,7 +7,7 @@ {{ $dataType->display_name_plural }} @if (Voyager::can('add_'.$dataType->name)) - Add New + {{ trans('voyager.generic_add_new') }} @endif @@ -27,7 +27,7 @@ @foreach($dataType->browseRows as $rows) {{ $rows->display_name }} @endforeach - Actions + {{ trans('voyager.generic_actions') }} @@ -96,18 +96,18 @@ @endforeach @if (Voyager::can('delete_'.$dataType->name)) - - + + @endif @if (Voyager::can('edit_'.$dataType->name)) - - + + @endif @if (Voyager::can('read_'.$dataType->name)) - - + + @endif @@ -117,7 +117,7 @@ @if (isset($dataType->server_side) && $dataType->server_side)
-
Showing {{ $dataTypeContent->firstItem() }} to {{ $dataTypeContent->lastItem() }} of {{ $dataTypeContent->total() }} entries
+
{{ trans('generic_showing_entries', $dataTypeContent->total(), ['from' => $dataTypeContent->firstItem(), 'to' => $dataTypeContent->lastItem(), 'all' => $dataTypeContent->total()]) }}
{{ $dataTypeContent->links() }} @@ -133,19 +133,18 @@
- -

Are you sure you want to delete - this {{ strtolower($dataType->display_name_singular) }}?

+

{{ trans('voyager.generic_delete_question') }} {{ strtolower($dataType->display_name_singular) }}?

{{ method_field("DELETE") }} {{ csrf_field() }} + value="{{ trans('voyager.generic_delete_confirm') }} {{ strtolower($dataType->display_name_singular) }}">
- +
diff --git a/resources/views/bread/edit-add.blade.php b/resources/views/bread/edit-add.blade.php index 535e967020..eabff7108a 100644 --- a/resources/views/bread/edit-add.blade.php +++ b/resources/views/bread/edit-add.blade.php @@ -5,14 +5,14 @@ @stop @if(isset($dataTypeContent->id)) - @section('page_title','Edit '.$dataType->display_name_singular) + @section('page_title', trans('voyager.generic_edit').' '.$dataType->display_name_singular) @else - @section('page_title','Add '.$dataType->display_name_singular) + @section('page_title', trans('voyager.generic_add').' '.$dataType->display_name_singular) @endif @section('page_header')

- @if(isset($dataTypeContent->id)){{ 'Edit' }}@else{{ 'New' }}@endif {{ $dataType->display_name_singular }} + @if(isset($dataTypeContent->id)){{ trans('voyager.generic_edit') }}@else{{ trans('voyager.generic_new') }}@endif {{ $dataType->display_name_singular }}

@include('voyager::multilingual.language-selector') @stop @@ -25,7 +25,7 @@
-

@if(isset($dataTypeContent->id)){{ 'Edit' }}@else{{ 'Add New' }}@endif {{ $dataType->display_name_singular }}

+

@if(isset($dataTypeContent->id)){{ trans('voyager.generic_edit') }}@else{{ trans('voyager.generic_add_new') }}@endif {{ $dataType->display_name_singular }}

@@ -75,7 +75,7 @@ class="form-edit-add"
- +
@@ -100,16 +100,16 @@ class="form-edit-add"
-

Are You Sure

+

{{ trans('voyager.generic_are_you_sure') }}

-

Are you sure you want to delete ''

+

{{ trans('voyager.generic_are_you_sure_delete') }} ''

- - +
@@ -125,15 +125,6 @@ class="form-edit-add" $('document').ready(function () { $('.toggleswitch').bootstrapToggle(); - - //Init datepicker for date fields if data-datepicker attribute defined - //or if browser does not handle date inputs - $('.form-group input[type=date]').each(function (idx, elt) { - if (elt.type != 'date' || elt.hasAttribute('data-datepicker')) { - elt.type = 'text'; - $(elt).datetimepicker($(elt).data('datepicker')); - } - }); @if ($isModelTranslatable) $('.side-body').multilingual({"editing": true}); diff --git a/resources/views/bread/partials/relationship-edit-add.blade.php b/resources/views/bread/partials/relationship-edit-add.blade.php index 9cdb5f0cee..49ba0ecf02 100644 --- a/resources/views/bread/partials/relationship-edit-add.blade.php +++ b/resources/views/bread/partials/relationship-edit-add.blade.php @@ -11,8 +11,8 @@ @endforeach - + - \ No newline at end of file + diff --git a/resources/views/bread/read.blade.php b/resources/views/bread/read.blade.php index a646e3d0fb..e616cadf9a 100644 --- a/resources/views/bread/read.blade.php +++ b/resources/views/bread/read.blade.php @@ -4,18 +4,18 @@ @section('page_header')

- Viewing {{ ucfirst($dataType->display_name_singular) }}   + {{ trans('voyager.generic_viewing') }} {{ ucfirst($dataType->display_name_singular) }}   @if (Voyager::can('edit_'.$dataType->name))   - Edit + {{ trans('voyager.generic_edit') }} @endif   - Return to List - + {{ trans('voyager.generic_return_to_list') }} +

@include('voyager::multilingual.language-selector') @stop diff --git a/resources/views/dashboard/navbar.blade.php b/resources/views/dashboard/navbar.blade.php index 3f30df2fa4..6662fdf758 100644 --- a/resources/views/dashboard/navbar.blade.php +++ b/resources/views/dashboard/navbar.blade.php @@ -4,17 +4,17 @@ -