From 72337e33559ae849b67c512b85de7c23406cd781 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 16 Jan 2019 16:24:25 +0300 Subject: [PATCH 0001/1219] Admin Panel: Translates fixes. --- site/plugins/admin/languages/en.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en.yaml index 02117faf..673ee221 100755 --- a/site/plugins/admin/languages/en.yaml +++ b/site/plugins/admin/languages/en.yaml @@ -205,6 +205,7 @@ admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" admin_menus_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_menus_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" admin_fieldsets_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" From abb114159c132cf5cfa4e6600e5ba66b0a60e2e0 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 16 Jan 2019 17:26:05 +0300 Subject: [PATCH 0002/1219] Admin Panel: Translates - REFACTORING. --- site/plugins/admin/languages/en.yaml | 304 +++++++++++---------------- 1 file changed, 123 insertions(+), 181 deletions(-) diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en.yaml index 673ee221..cd059dc5 100755 --- a/site/plugins/admin/languages/en.yaml +++ b/site/plugins/admin/languages/en.yaml @@ -1,109 +1,72 @@ admin: "Admin" -admin_cache: "Cache" admin_cancel: "Cancel" admin_create: "Create" admin_debugging: "Debugging" -admin_description: "Description" admin_email: "Email" admin_flextype_version: "Flextype Version" -admin_information_heading: "Information" +admin_information: "Information" admin_installed: "Installed" admin_keywords: "Keywords" admin_login: "Login" -admin_menu_content_entries: "Entries" -admin_menu_extends: "Extends" -admin_menu_extends_plugins: "Plugins" -admin_menu_extends_themes: "Themes" -admin_menu_help: "Help" -admin_menu_help_documentation: "Getting Help" -admin_menu_logout: "Logout" -admin_menu_entries: "Entries" -admin_menu_profile: "Profile" -admin_menu_system: "System" -admin_menu_system_information: "Information" -admin_menu_system_settings: "Settings" -admin_menu_view_site: "View Site" -admin_menu_extends_snippets: "Snippets" -admin_message_cache_files_deleted: "Cache files deleted" -admin_message_entry_changes_saved: "Changes successfully saved" -admin_message_entry_cloned: "Entry cloned" -admin_message_entry_created: "Entry created" -admin_message_entry_deleted: "Entry deleted" -admin_message_entry_file_deleted: "File successfully deleted" -admin_message_entry_file_uploaded: "File successfully uploaded" -admin_message_entry_file_not_uploaded: "File was not uploaded" -admin_message_entry_moved: "Entry moved" -admin_message_entry_renamed: "Entry renamed" -admin_message_settings_saved: "Settings saved" -admin_message_wrong_username_password: "Wrong username or password" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" admin_not_installed: "Not Installed" -admin_off: "off" -admin_on: "on" +admin_off: "Off" +admin_on: "On" admin_add: "Add" -admin_entries_attributes: "Entry Attributes" -admin_entries_fieldset_for_template: "Fieldset for template" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" admin_content: "Content" -admin_entries_create_new: "Create New Entry" +admin_create_new_entry: "Create New Entry" admin_date: "Date" -admin_entries_delete: "Delete" -admin_entries_description: "Description" -admin_entries_draft: "Draft" -admin_entries_edit: "Edit" -admin_menu_content_menus: "Menus" -admin_entries_edit_blocks: "Blocks" -admin_entries_edit_media: "Media" -admin_entries_edit_entry: "Edit entry" -admin_entries_edit_settings: "Settings" -admin_entries_edit_template: "Template" -admin_entries_edit_templates: "Templates" -admin_entries_editor: "Entry" -admin_entries_editor_fieldset: "Fieldset" -admin_entries_editor_source: "Source" -admin_entries_editor_template: "Template" -admin_entries_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_entries_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" -admin_entries_files: "Files" -admin_entries_files_delete: "Delete" -admin_entries_files_upload: "Upload" -admin_entries_heading: "Entries" -admin_entries_hidden: "Hidden" -admin_entries_image_preview: "Image preview" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" admin_move: "Move" -admin_entries_name: "Name" -admin_entries_entry: "Entry" -admin_entries_parent_entry: "Entry parent" -admin_entries_preview: "Preview" -admin_entries_publish: "Publish" -admin_entries_rename: "Rename" -admin_entries_rename_entry: "Rename" -admin_entries_save_entry: "Save entry" -admin_entries_settings: "Settings" -admin_entries_switch_back_to_editor_mode: "Editor mode" -admin_entries_switch_to_expert_mode: "Expert mode" -admin_entries_template: "Template" -admin_entries_title: "Title" -admin_entries_url: "Url" -admin_entries_view: "View" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" admin_visibility: "Visibility" -admin_entries_visible: "Visible" +admin_visible: "Visible" admin_password: "Password" admin_php_built_on: "PHP Built On" admin_php_version: "PHP Version" -admin_plugins_author_email: "Author email" -admin_plugins_author_name: "Author name" -admin_plugins_author_url: "Author url" -admin_plugins_bugs: "Bugs" -admin_plugins_description: "Description" -admin_plugins_get_more_plugins: "Get More Plugins" -admin_plugins_heading: "Plugins" -admin_plugins_homepage: "Homepage" -admin_plugins_info: "Info" -admin_plugins_license: "License" -admin_plugins_name: "Name" -admin_plugins_status: "Status" -admin_plugins_status_disabled: "disabled" -admin_plugins_status_enabled: "enabled" -admin_plugins_version: "Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" admin_role: "Role" admin_save: "Save" admin_security_check_results: "Security check results" @@ -111,75 +74,53 @@ admin_security_check_results_debug: "Due to the type and amount of information a admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" admin_server: "Server" -admin_settings: "Settings" admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" admin_system: "System" -admin_system_clear_cache: "Clear cache" -admin_system_settings_system_entries_error404_title: "Error404 entry title" -admin_system_settings_system_entries_error404_description: "Error404 entry description" -admin_system_settings_system_entries_error404_content: "Error404 entry content" -admin_system_settings_system_entries_error404_template: "Error404 entry template" -admin_system_settings_heading: "Settings" -admin_system_settings_site: "Site" -admin_system_settings_general: "General" -admin_system_settings_error_404_page: "Error 404 page" -admin_system_settings_debuggig: "Debugging" -admin_system_settings_cache: "Cache" -admin_system_settings_site_author_email: "Author email" -admin_system_settings_site_author_name: "Author name" -admin_system_settings_site_description: "Site description" -admin_system_settings_site_keywords: "Site keywords" -admin_system_settings_site_robots: "Robots" -admin_system_settings_site_title: "Site title" -admin_system_settings_system: "System" -admin_system_settings_system_cache_driver: "Cache driver" -admin_system_settings_system_cache_enabled: "Cache enabled" -admin_system_settings_system_cache_lifetime: "Cache lifetime" -admin_system_settings_system_cache_prefix: "Cache prefix" -admin_system_settings_system_charset: "Charset" -admin_system_settings_system_date_format: "Date format" -admin_system_settings_system_errors_display: "Display errors" -admin_system_settings_system_locale: "Locale" -admin_system_settings_system_entries_main: "Main entry" -admin_system_settings_system_theme: "Theme" -admin_system_settings_system_timezone: "Timezone" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" admin_username: "Username" -admin_users_create: "Create User" -admin_users_create_new: "Create New User" -admin_view_site: "View Site" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menus_heading: "Menus" admin_menu: "Menu" -admin_menus: "Menu" -admin_menus_create_new_category: "Create New Category" -admin_menus_delete_category: "Delete Category" -admin_menus_create_new_item: "Create New Item" -admin_menus_name: "Name" -admin_menu_item_edit: "Edit" -admin_menu_item_delete: "Delete" -admin_menus_url: "Url" -admin_menus_order: "Order" -admin_menus_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" -admin_menu_extends_fieldsets: "Fieldsets" -admin_menu_extends_templates: "Templates" -admin_preview: "Preview" -admin_template: "Template" -admin_templates: "Templates" -admin_template_create_new: "Create New Template" -admin_fieldset: "Fieldset" -admin_create_new_fieldset: "Create New Fieldset" -admin_name: "Name" -admin_fieldsets: "Fieldsets" -admin_edit: "Edit" -admin_rename: "Rename" -admin_duplicate: "Duplicate" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" admin_delete: "Delete" -admin_title: "Title" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" admin_summary: "Summary" admin_snippet: "Snippet" -admin_snippets: "Snippets" admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" @@ -206,40 +147,41 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" -admin_menus_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_menus_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" -admin_fieldsets_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_fieldsets_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" -admin_templates_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_snippets_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_system_settings_system_cache_enabled_false: "Off" -admin_system_settings_system_cache_enabled_true: "On" -admin_system_settings_system_errors_enabled_false: "Off" -admin_system_settings_system_errors_enabled_true: "On" -admin_system_settings_media: "Media" -admin_system_settings_system_upload_images_quality: "Quality" -admin_system_settings_system_upload_images_width: "Width" -admin_system_settings_system_upload_images_height: "Height" -admin_system_settings_system_upload_accept_file_types: "Accept file types" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_types: "Accept file types" admin_embeded_code: "Embeded Code" admin_shortcode: "Shortcode" admin_php_code: "PHP Code" -admin_entries_choose_files_to_upload: "Choose file" -admin_entries_browse_files: "Browse" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" admin_copy: "Copy" -admin_system_settings_admin_panel: "Admin Panel" -admin_system_settings_admin_panel_theme: "Theme" -admin_system_settings_admin_panel_theme_light: "Light" -admin_system_settings_admin_panel_theme_dark: "Dark" -admin_entries_move: "Move" -admin_menu_name: "Name" -admin_system_settings_cache_memcache_server: "Memcache Server" -admin_system_settings_cache_memcache_port: "Memcache Port" -admin_system_settings_cache_memcached_server: "Memcached Server" -admin_system_settings_cache_memcached_port: "Memcached Port" -admin_system_settings_cache_redis_socket: "Redis Socket" -admin_system_settings_cache_redis_password: "Redis Password" -admin_system_settings_cache_redis_server: "Redis Server" -admin_system_settings_cache_redis_port: "Redis Port" -admin_system_settings_cache_sqlite3_database: "SQLite3 Database" -admin_system_settings_cache_sqlite3_table: "SQLite3 Table" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 48081d1b9fd0c48f20fc605dc4fcc91f90569226 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 16 Jan 2019 19:25:23 +0300 Subject: [PATCH 0003/1219] Admin Panel: Translates - REFACTORING. --- site/plugins/admin/languages/en.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en.yaml index cd059dc5..b26a6ab0 100755 --- a/site/plugins/admin/languages/en.yaml +++ b/site/plugins/admin/languages/en.yaml @@ -162,7 +162,7 @@ admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" admin_height: "Height" -admin_types: "Accept file types" +admin_accept_file_types: "Accept file types" admin_embeded_code: "Embeded Code" admin_shortcode: "Shortcode" admin_php_code: "PHP Code" From 2e4c2118bc2aca39b7cd6f19389bb1741e8b6dca Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 16 Jan 2019 19:38:03 +0300 Subject: [PATCH 0004/1219] Admin Panel: Translates - REFACTORING. --- .../views/templates/auth/registration.php | 4 +- .../views/templates/content/entries/add.php | 8 +- .../templates/content/entries/content.php | 6 +- .../views/templates/content/entries/list.php | 14 +-- .../views/templates/content/entries/media.php | 14 +-- .../views/templates/content/entries/move.php | 6 +- .../templates/content/entries/rename.php | 6 +- .../templates/content/entries/source.php | 6 +- .../views/templates/content/entries/type.php | 2 +- .../templates/extends/fieldsets/list.php | 4 +- .../views/templates/extends/menus/add.php | 2 +- .../views/templates/extends/menus/list.php | 4 +- .../views/templates/extends/menus/rename.php | 4 +- .../views/templates/extends/plugins/list.php | 30 +++--- .../views/templates/extends/snippets/list.php | 8 +- .../templates/extends/templates/list.php | 2 +- .../templates/system/information/list.php | 4 +- .../views/templates/system/settings/list.php | 96 +++++++++---------- .../admin/views/templates/users/profile.php | 4 +- 19 files changed, 112 insertions(+), 112 deletions(-) diff --git a/site/plugins/admin/views/templates/auth/registration.php b/site/plugins/admin/views/templates/auth/registration.php index 1211eb8d..5ddade45 100644 --- a/site/plugins/admin/views/templates/auth/registration.php +++ b/site/plugins/admin/views/templates/auth/registration.php @@ -17,7 +17,7 @@ Themes::view('admin/views/partials/content-start')->display();
-

+

@@ -31,7 +31,7 @@ Themes::view('admin/views/partials/content-start')->display();
- +
diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php index 94906a88..59f31cbc 100644 --- a/site/plugins/admin/views/templates/content/entries/add.php +++ b/site/plugins/admin/views/templates/content/entries/add.php @@ -13,12 +13,12 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries_heading'), + 'title' => __('admin_entries'), 'attributes' => ['class' => 'navbar-item'] ], 'entries_add' => [ 'link' => Http::getBaseUrl() . '/admin/entries/add?entry='.Http::get('entry'), - 'title' => __('admin_entries_create_new'), + 'title' => __('admin_create_new_entry'), 'attributes' => ['class' => 'navbar-item active'] ] ]) @@ -32,11 +32,11 @@ Themes::view('admin/views/partials/content-start')->display();
- 'entryTitle']) ?> + 'entryTitle']) ?> 'form-control', 'id' => 'entryTitle', 'required', 'data-validation' => 'length required', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_title_empty_input')]) ?>
- 'entrySlug']) ?> + 'entrySlug']) ?> 'form-control', 'id' => 'entrySlug', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_name_empty_input')]) ?>
diff --git a/site/plugins/admin/views/templates/content/entries/content.php b/site/plugins/admin/views/templates/content/entries/content.php index 778bee02..deb74f4c 100644 --- a/site/plugins/admin/views/templates/content/entries/content.php +++ b/site/plugins/admin/views/templates/content/entries/content.php @@ -13,17 +13,17 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'edit_entry' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name, - 'title' => __('admin_entries_editor'), + 'title' => __('admin_content'), 'attributes' => ['class' => 'navbar-item active'] ], 'edit_entry_media' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true', - 'title' => __('admin_entries_edit_media'), + 'title' => __('admin_media'), 'attributes' => ['class' => 'navbar-item'] ], 'edit_entry_source' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true', - 'title' => __('admin_entries_editor_source'), + 'title' => __('admin_source'), 'attributes' => ['class' => 'navbar-item'] ] ]) diff --git a/site/plugins/admin/views/templates/content/entries/list.php b/site/plugins/admin/views/templates/content/entries/list.php index 79fa7a97..d954d975 100644 --- a/site/plugins/admin/views/templates/content/entries/list.php +++ b/site/plugins/admin/views/templates/content/entries/list.php @@ -6,14 +6,14 @@ ->assign('links', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries_heading'), + 'title' => __('admin_entries'), 'attributes' => ['class' => 'navbar-item active'] ] ]) ->assign('buttons', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/entries/add?entry='.Http::get('entry') , - 'title' => __('admin_entries_create_new'), + 'title' => __('admin_create_new_entry'), 'attributes' => ['class' => 'float-right btn'] ] ]) @@ -25,7 +25,7 @@ - + @@ -41,20 +41,20 @@ diff --git a/site/plugins/admin/views/templates/content/entries/media.php b/site/plugins/admin/views/templates/content/entries/media.php index 593bc931..4c812026 100644 --- a/site/plugins/admin/views/templates/content/entries/media.php +++ b/site/plugins/admin/views/templates/content/entries/media.php @@ -10,17 +10,17 @@ use function Flextype\Component\I18n\__; ->assign('links', [ 'edit_entry' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name, - 'title' => __('admin_entries_editor'), + 'title' => __('admin_content'), 'attributes' => ['class' => 'navbar-item'] ], 'edit_entry_media' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true', - 'title' => __('admin_entries_edit_media'), + 'title' => __('admin_media'), 'attributes' => ['class' => 'navbar-item active'] ], 'edit_entry_source' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true', - 'title' => __('admin_entries_editor_source'), + 'title' => __('admin_source'), 'attributes' => ['class' => 'navbar-item'] ] ]) @@ -35,10 +35,10 @@ use function Flextype\Component\I18n\__;
- +
- 'btn btn-outline-secondary']) ?> + 'btn btn-outline-secondary']) ?>
@@ -75,7 +75,7 @@ use function Flextype\Component\I18n\__; diff --git a/site/plugins/admin/views/templates/content/entries/move.php b/site/plugins/admin/views/templates/content/entries/move.php index d20400b6..8d35d2a0 100644 --- a/site/plugins/admin/views/templates/content/entries/move.php +++ b/site/plugins/admin/views/templates/content/entries/move.php @@ -10,12 +10,12 @@ use function Flextype\Component\I18n\__; ->assign('links', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries_heading'), + 'title' => __('admin_entries'), 'attributes' => ['class' => 'navbar-item'] ], 'entries_move' => [ 'link' => Http::getBaseUrl() . '/admin/entries/move', - 'title' => __('admin_entries_move'), + 'title' => __('admin_move'), 'attributes' => ['class' => 'navbar-item active'] ] ]) @@ -32,7 +32,7 @@ use function Flextype\Component\I18n\__;
- + 'form-control')) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/content/entries/rename.php b/site/plugins/admin/views/templates/content/entries/rename.php index 8843b31a..0f60ac64 100644 --- a/site/plugins/admin/views/templates/content/entries/rename.php +++ b/site/plugins/admin/views/templates/content/entries/rename.php @@ -12,12 +12,12 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries_heading'), + 'title' => __('admin_entries'), 'attributes' => ['class' => 'navbar-item'] ], 'entries_add' => [ 'link' => Http::getBaseUrl() . '/admin/entries/rename', - 'title' => __('admin_entries_rename'), + 'title' => __('admin_rename'), 'attributes' => ['class' => 'navbar-item active'] ] ]) @@ -34,7 +34,7 @@ Themes::view('admin/views/partials/content-start')->display();
- 'entryName']) ?> + 'entryName']) ?> 'form-control', 'id' => 'entryName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/content/entries/source.php b/site/plugins/admin/views/templates/content/entries/source.php index 4cb74557..0fba242e 100644 --- a/site/plugins/admin/views/templates/content/entries/source.php +++ b/site/plugins/admin/views/templates/content/entries/source.php @@ -10,17 +10,17 @@ use function Flextype\Component\I18n\__; ->assign('links', [ 'edit_entry' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name, - 'title' => __('admin_entries_editor'), + 'title' => __('admin_content'), 'attributes' => ['class' => 'navbar-item'] ], 'edit_entry_media' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true', - 'title' => __('admin_entries_edit_media'), + 'title' => __('admin_media'), 'attributes' => ['class' => 'navbar-item'] ], 'edit_entry_source' => [ 'link' => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true', - 'title' => __('admin_entries_editor_source'), + 'title' => __('admin_source'), 'attributes' => ['class' => 'navbar-item active'] ] ]) diff --git a/site/plugins/admin/views/templates/content/entries/type.php b/site/plugins/admin/views/templates/content/entries/type.php index 55cb18a9..81b6cd5a 100644 --- a/site/plugins/admin/views/templates/content/entries/type.php +++ b/site/plugins/admin/views/templates/content/entries/type.php @@ -10,7 +10,7 @@ use function Flextype\Component\I18n\__; ->assign('links', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries_heading'), + 'title' => __('admin_entries'), 'attributes' => ['class' => 'navbar-item'] ], 'entries_move' => [ diff --git a/site/plugins/admin/views/templates/extends/fieldsets/list.php b/site/plugins/admin/views/templates/extends/fieldsets/list.php index beadc7de..a38d7282 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/list.php +++ b/site/plugins/admin/views/templates/extends/fieldsets/list.php @@ -25,7 +25,7 @@
- +
- +
- + @@ -42,7 +42,7 @@ Toggle Dropdown diff --git a/site/plugins/admin/views/templates/extends/menus/add.php b/site/plugins/admin/views/templates/extends/menus/add.php index 5d19fed4..8cac6e72 100644 --- a/site/plugins/admin/views/templates/extends/menus/add.php +++ b/site/plugins/admin/views/templates/extends/menus/add.php @@ -13,7 +13,7 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'menus' => [ 'link' => Http::getBaseUrl() . '/admin/menus', - 'title' => __('admin_menus_heading'), + 'title' => __('admin_menus'), 'attributes' => ['class' => 'navbar-item'] ], 'menus_add' => [ diff --git a/site/plugins/admin/views/templates/extends/menus/list.php b/site/plugins/admin/views/templates/extends/menus/list.php index e8107e25..680a5a9a 100644 --- a/site/plugins/admin/views/templates/extends/menus/list.php +++ b/site/plugins/admin/views/templates/extends/menus/list.php @@ -6,7 +6,7 @@ ->assign('links', [ 'menus' => [ 'link' => Http::getBaseUrl() . '/admin/menus', - 'title' => __('admin_menus_heading'), + 'title' => __('admin_menus'), 'attributes' => ['class' => 'navbar-item active'] ] ]) @@ -25,7 +25,7 @@
- + diff --git a/site/plugins/admin/views/templates/extends/menus/rename.php b/site/plugins/admin/views/templates/extends/menus/rename.php index 48e04e03..af8c16f5 100644 --- a/site/plugins/admin/views/templates/extends/menus/rename.php +++ b/site/plugins/admin/views/templates/extends/menus/rename.php @@ -13,7 +13,7 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'menus' => [ 'link' => Http::getBaseUrl() . '/admin/menus', - 'title' => __('admin_menus_heading'), + 'title' => __('admin_menus'), 'attributes' => ['class' => 'navbar-item'] ], 'menus_add' => [ @@ -32,7 +32,7 @@ Themes::view('admin/views/partials/content-start')->display();
- 'menuName']) ?> + 'menuName']) ?> 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_menu_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/extends/plugins/list.php b/site/plugins/admin/views/templates/extends/plugins/list.php index 0b2ddad3..75238dcd 100644 --- a/site/plugins/admin/views/templates/extends/plugins/list.php +++ b/site/plugins/admin/views/templates/extends/plugins/list.php @@ -9,14 +9,14 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'plugins' => [ 'link' => Http::getBaseUrl() . '/admin/plugins', - 'title' => __('admin_plugins_heading'), + 'title' => __('admin_plugins'), 'attributes' => ['class' => 'navbar-item active'] ] ]) ->assign('buttons', [ 'plugins_get_more' => [ 'link' => 'http://flextype.org/download/plugins', - 'title' => __('admin_plugins_get_more_plugins'), + 'title' => __('admin_get_more_plugins'), 'attributes' => ['class' => 'float-right btn', 'target' => '_blank'] ] ]) @@ -31,9 +31,9 @@ Themes::view('admin/views/partials/content-start')->display();
- + - + @@ -51,7 +51,7 @@ Themes::view('admin/views/partials/content-start')->display(); data-homepage="" data-bugs="" data-license="" - > + >'; + if (!in_array('mod_rewrite', apache_get_modules())) { + echo ''; } else { - echo ''; + echo ''; } } else { - echo ''; + echo ''; } ?> '; + echo ''; } else { - echo ''; + echo ''; } ?> '; + echo ''; } else { - echo ''; + echo ''; } ?> diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php index 60d30ec3..77741c4a 100644 --- a/site/plugins/admin/views/templates/system/settings/list.php +++ b/site/plugins/admin/views/templates/system/settings/list.php @@ -5,23 +5,23 @@ use function Flextype\Component\I18n\__; Themes::view('admin/views/partials/head')->display(); Themes::view('admin/views/partials/navbar') - ->assign('links', [ + ->assign('links', [ 'settings' => [ 'link' => Http::getBaseUrl() . '/admin/settings', 'title' => __('admin_settings'), 'attributes' => ['class' => 'navbar-item active'] - ] + ] ]) ->assign('buttons', [ - 'save' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ], - 'settings_clear_cache' => [ - 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token='.Token::generate(), - 'title' => __('admin_clear_cache'), - 'attributes' => ['class' => 'float-right btn'] + 'save' => [ + 'link' => 'javascript:;', + 'title' => __('admin_save'), + 'attributes' => ['class' => 'js-save-form-submit float-right btn'] + ], + 'settings_clear_cache' => [ + 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token='.Token::generate(), + 'title' => __('admin_clear_cache'), + 'attributes' => ['class' => 'float-right btn'] ] ]) ->display(); @@ -115,7 +115,7 @@ Themes::view('admin/views/partials/content-start')->display();
'systemSettingsSystemTheme']) ?> - 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?> + 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
diff --git a/site/plugins/admin/views/templates/users/profile.php b/site/plugins/admin/views/templates/users/profile.php index 31cf7929..9d58da45 100644 --- a/site/plugins/admin/views/templates/users/profile.php +++ b/site/plugins/admin/views/templates/users/profile.php @@ -11,8 +11,8 @@ Themes::view('admin/views/partials/navbar') 'link' => Http::getBaseUrl() . '/admin/profile', 'title' => __('admin_profile'), 'attributes' => ['class' => 'navbar-item active'] - ], - ]) + ], + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> diff --git a/site/themes/default/views/partials/head.php b/site/themes/default/views/partials/head.php index 35a05048..f29ca669 100755 --- a/site/themes/default/views/partials/head.php +++ b/site/themes/default/views/partials/head.php @@ -18,8 +18,8 @@ - - + + diff --git a/site/themes/default/views/partials/tail.php b/site/themes/default/views/partials/tail.php index 29ee280b..c1e9ccc3 100755 --- a/site/themes/default/views/partials/tail.php +++ b/site/themes/default/views/partials/tail.php @@ -1,8 +1,8 @@ - - + + diff --git a/site/themes/default/views/templates/about.php b/site/themes/default/views/templates/about.php index f835c8b2..9a9487c4 100644 --- a/site/themes/default/views/templates/about.php +++ b/site/themes/default/views/templates/about.php @@ -2,5 +2,5 @@ display() ?>

- + display() ?> From 34c9207ce91fee659ecc1a87ed4308f7ade921fd Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Fri, 1 Feb 2019 13:40:21 +0000 Subject: [PATCH 0171/1219] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- flextype/Shortcodes.php | 4 ++-- flextype/parsers/FrontmatterParser.php | 8 ++++--- site/plugins/admin/classes/EntriesManager.php | 24 +++++++++---------- site/plugins/admin/views/partials/tail.php | 16 +++++++++---- .../views/templates/content/entries/add.php | 2 +- .../templates/extends/templates/edit.php | 2 +- .../views/templates/system/settings/list.php | 2 +- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 77346fcf..11ad824f 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -164,8 +164,8 @@ class Shortcodes { ($s->getParameter('width')) and $attributes['width'] = $s->getParameter('width'); ($s->getParameter('height')) and $attributes['height'] = $s->getParameter('height'); ($s->getParameter('class')) and $attributes['class'] = $s->getParameter('class'); - ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); - ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); + ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); + ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); return Images::getImage($s->getParameter('path'), $params, $attributes); }); diff --git a/flextype/parsers/FrontmatterParser.php b/flextype/parsers/FrontmatterParser.php index 00bd813e..78aa090d 100644 --- a/flextype/parsers/FrontmatterParser.php +++ b/flextype/parsers/FrontmatterParser.php @@ -26,10 +26,12 @@ class FrontmatterParser { */ public static function parse(string $content) : array { - $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL.ltrim($content)); + $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL . ltrim($content)); - if (count($parts) < 3) return ['matter' => [], 'body' => $content]; + if (count($parts) < 3) { + return ['matter' => [], 'body' => $content]; + } - return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL.'---'.PHP_EOL, array_slice($parts, 2))]; + return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2))]; } } diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index d2b5d9ad..cb13178b 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -83,12 +83,12 @@ class EntriesManager // Create a entry! if (Filesystem::write( $file, - '---'."\n". - YamlParser::encode(array_replace_recursive($frontmatter, $_frontmatter)). - '---'."\n" + '---' . "\n" . + YamlParser::encode(array_replace_recursive($frontmatter, $_frontmatter)) . + '---' . "\n" )) { Notification::set('success', __('admin_message_entry_created')); - Http::redirect(Http::getBaseUrl().'/admin/entries/?entry='.Http::post('parent_entry')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); } } } else { @@ -176,13 +176,13 @@ class EntriesManager if (Filesystem::write( PATH['entries'] . '/' . Http::post('entry') . '/entry.html', - '---'."\n". - $frontmatter."\n". - '---'."\n". + '---' . "\n" . + $frontmatter . "\n" . + '---' . "\n" . $content )) { Notification::set('success', __('admin_message_entry_changes_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries?entry='.implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); + Http::redirect(Http::getBaseUrl() . '/admin/entries?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); } } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); @@ -294,13 +294,13 @@ class EntriesManager Filesystem::write( PATH['entries'] . '/' . Http::get('entry') . '/entry.html', - '---'."\n". - $frontmatter."\n". - '---'."\n". + '---' . "\n" . + $frontmatter . "\n" . + '---' . "\n" . $content ); Notification::set('success', __('admin_message_entry_changes_saved')); - Http::redirect(Http::getBaseUrl().'/admin/entries/edit?entry='.Http::get('entry')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry')); } } diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 6cb9aaec..640c0a16 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -5,12 +5,18 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets - + - - + + @@ -147,7 +153,8 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets mode: "yaml", - + mode: "application/x-httpd-php", indentWithTabs: false, @@ -185,4 +192,5 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php index e00581a3..a6beccdd 100644 --- a/site/plugins/admin/views/templates/content/entries/add.php +++ b/site/plugins/admin/views/templates/content/entries/add.php @@ -17,7 +17,7 @@ Themes::view('admin/views/partials/navbar') 'attributes' => ['class' => 'navbar-item'] ], 'entries_add' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/add?entry='.Http::get('entry'), + 'link' => Http::getBaseUrl() . '/admin/entries/add?entry=' . Http::get('entry'), 'title' => __('admin_create_new_entry'), 'attributes' => ['class' => 'navbar-item active'] ] diff --git a/site/plugins/admin/views/templates/extends/templates/edit.php b/site/plugins/admin/views/templates/extends/templates/edit.php index 567c6790..f4e2ac89 100644 --- a/site/plugins/admin/views/templates/extends/templates/edit.php +++ b/site/plugins/admin/views/templates/extends/templates/edit.php @@ -12,7 +12,7 @@ Themes::view('admin/views/partials/head')->display(); Themes::view('admin/views/partials/navbar') ->assign('links', [ 'template' => [ - 'link' => Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::get('template') . '&type='.$type, + 'link' => Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::get('template') . '&type=' . $type, 'title' => __('admin_template'), 'attributes' => ['class' => 'navbar-item active'] ] diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php index 77741c4a..5aa0c2a4 100644 --- a/site/plugins/admin/views/templates/system/settings/list.php +++ b/site/plugins/admin/views/templates/system/settings/list.php @@ -19,7 +19,7 @@ Themes::view('admin/views/partials/navbar') 'attributes' => ['class' => 'js-save-form-submit float-right btn'] ], 'settings_clear_cache' => [ - 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token='.Token::generate(), + 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token=' . Token::generate(), 'title' => __('admin_clear_cache'), 'attributes' => ['class' => 'float-right btn'] ] From 6b2a5e4300b70107625f190c0c6d4d2921430e05 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 16:53:18 +0300 Subject: [PATCH 0172/1219] Flextype Core: Using new Flextype Filesystem Component 2.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5f5d3a9c..354deae7 100755 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "flextype-components/debug" : "1.0.0", "flextype-components/event" : "1.0.4", "flextype-components/errorhandler" : "1.0.5", - "flextype-components/filesystem" : "1.1.5", + "flextype-components/filesystem" : "2.0.0", "flextype-components/form" : "1.0.2", "flextype-components/i18n" : "1.2.0", "flextype-components/http" : "1.1.1", From 805f42e9206b1365cfc6e9efa6e928e9bda2621d Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 17:01:55 +0300 Subject: [PATCH 0173/1219] Flextype Core: Using new Flextype Filesystem Component 2.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 354deae7..174cc9cd 100755 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "flextype-components/debug" : "1.0.0", "flextype-components/event" : "1.0.4", "flextype-components/errorhandler" : "1.0.5", - "flextype-components/filesystem" : "2.0.0", + "flextype-components/filesystem" : "2.0.1", "flextype-components/form" : "1.0.2", "flextype-components/i18n" : "1.2.0", "flextype-components/http" : "1.1.1", From f8077018eca6ad1e24ff2637c3b29241f11e6565 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 17:48:48 +0300 Subject: [PATCH 0174/1219] Flextype Admin Panel: tail.php code fixes. --- site/plugins/admin/views/partials/tail.php | 42 ++++++++++------------ 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 640c0a16..95e603ba 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -5,21 +5,22 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets - + - - - - - + + + + + + + + + + + + - + From fbf726b45effff8cd3e4d9ecb829c877e674e02a Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 18:25:05 +0300 Subject: [PATCH 0175/1219] Flextype Core: Entries - code fixes according Scrutinizer Tests. --- flextype/Entries.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 9bc8d174..4e417e14 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -312,6 +312,8 @@ class Entries { Http::setResponseStatus(404); + $entry = []; + $entry['title'] = Registry::get('settings.entries.error404.title'); $entry['description'] = Registry::get('settings.entries.error404.description'); $entry['content'] = Registry::get('settings.entries.error404.content'); @@ -334,7 +336,11 @@ class Entries public static function processEntry(string $file_path, bool $raw = false, bool $ignore_content = false) { // Get entry from file - $entry = trim(Filesystem::read($file_path)); + if ($entry_content = Filesystem::read($file_path)) { + $entry = $entry_content; + } + + $entry = trim($entry); // Return raw entry if $raw is true if ($raw) { @@ -346,9 +352,6 @@ class Entries $entry_frontmatter = $entry['matter']; $entry_content = $entry['body']; - // Create empty $_entry - $_entry = []; - // Process $entry_frontmatter with YAML and Shortcodes parsers $_entry = YamlParser::decode(Shortcodes::process($entry_frontmatter)); From a35fa15cb8e800c1d6e5a211a9fb1e90e1f39c95 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 18:34:24 +0300 Subject: [PATCH 0176/1219] Flextype Core: Entries - code fixes according Scrutinizer Tests. --- flextype/Entries.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index 4e417e14..4fa2eadc 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -335,6 +335,9 @@ class Entries */ public static function processEntry(string $file_path, bool $raw = false, bool $ignore_content = false) { + // Init Entry + $entry = ''; + // Get entry from file if ($entry_content = Filesystem::read($file_path)) { $entry = $entry_content; From e7e07a297895a55d0a13fd294db84befe99328f4 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Fri, 1 Feb 2019 15:51:11 +0000 Subject: [PATCH 0177/1219] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- site/plugins/admin/views/partials/tail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 95e603ba..39a68c5f 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -12,7 +12,7 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets - + From 18a09a2e46578a349f9c79047abf901846dd253e Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 19:10:36 +0300 Subject: [PATCH 0178/1219] Flextype Core: Themes - code fixes according Scrutinizer Tests. - The assignment to $theme_cache_id is dead and - removed. - The assignment to $theme_manifest is dead and - removed. --- flextype/Themes.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index 03b7efc0..86aa57db 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -61,12 +61,6 @@ class Themes */ private static function init() : void { - // Theme Manifest - $theme_manifest = []; - - // Theme cache id - $theme_cache_id = ''; - // Get current theme $theme = Registry::get('settings.theme'); From 0fa03ed782d67166067785cf598a9dd5ddd6b17b Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 19:11:18 +0300 Subject: [PATCH 0179/1219] Flextype Core: Plugins - code fixes according Scrutinizer Tests. - The assignment to $plugins_cache_id is dead and can be removed. --- flextype/Plugins.php | 1 - 1 file changed, 1 deletion(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 85e304d2..cce11524 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -229,7 +229,6 @@ class Plugins private static function init() : void { // Plugin cache id - $plugins_cache_id = ''; $_plugins_cache_id = ''; // Set empty plugins item From 6276bfedbec148aa55f1ac44137b736f488f187f Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 19:11:59 +0300 Subject: [PATCH 0180/1219] Flextype Core: YamlParser - code fixes according Scrutinizer Tests. - The parameter $flags is not used and could be removed. --- flextype/parsers/YamlParser.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flextype/parsers/YamlParser.php b/flextype/parsers/YamlParser.php index 8f6dce8c..a327df43 100644 --- a/flextype/parsers/YamlParser.php +++ b/flextype/parsers/YamlParser.php @@ -87,13 +87,11 @@ class YamlParser { * $array = YamlParser::decode($yaml_file_content); * * @param string $input A string containing YAML - * @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior - * * @return mixed The YAML converted to a PHP value * * @throws ParseException If the YAML is not valid */ - public static function decode(string $input, int $flags = 0) + public static function decode(string $input) { // Try native PECL YAML PHP extension first if available. if (YamlParser::$native && function_exists('yaml_parse')) { From 6384b7b3aa62c2e36a6096d2dd74ecff72af2543 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 1 Feb 2019 19:36:18 +0300 Subject: [PATCH 0181/1219] Create .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..c4815c82 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: php + +php: + - 7.1.3 + - 7.2 + - 7.3 From f899bbbf8759f6182aaf823d3968b07134b45789 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 1 Feb 2019 19:38:05 +0300 Subject: [PATCH 0182/1219] Update .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index c4815c82..1f22fffd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,8 @@ php: - 7.1.3 - 7.2 - 7.3 + +branches: + only: + - dev + - master From 9d631b27a2612d9dfd8911c542d3990ade86f42f Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 20:26:09 +0300 Subject: [PATCH 0183/1219] Flextype Admin Panel: code fixes according Scrutinizer Tests. - Using exit here is not recommended. --- site/plugins/admin/classes/EntriesManager.php | 18 +++++++++--------- .../plugins/admin/classes/FieldsetsManager.php | 10 +++++----- site/plugins/admin/classes/MenusManager.php | 10 +++++----- site/plugins/admin/classes/PluginsManager.php | 2 +- site/plugins/admin/classes/SettingsManager.php | 4 ++-- site/plugins/admin/classes/SnippetsManager.php | 10 +++++----- .../plugins/admin/classes/TemplatesManager.php | 10 +++++----- site/plugins/admin/classes/UsersManager.php | 6 +++--- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index cb13178b..7c0190e4 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -92,7 +92,7 @@ class EntriesManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -108,7 +108,7 @@ class EntriesManager Notification::set('success', __('admin_message_entry_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::get('entry_current')); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -121,7 +121,7 @@ class EntriesManager Notification::set('success', __('admin_message_entry_duplicated')); Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -142,7 +142,7 @@ class EntriesManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -185,7 +185,7 @@ class EntriesManager Http::redirect(Http::getBaseUrl() . '/admin/entries?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -213,7 +213,7 @@ class EntriesManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -259,7 +259,7 @@ class EntriesManager Notification::set('success', __('admin_message_entry_changes_saved')); Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::post('entry_name') . '&source=true'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -461,7 +461,7 @@ class EntriesManager Notification::set('success', __('admin_message_entry_file_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry') . '&media=true'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -511,7 +511,7 @@ class EntriesManager } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } } diff --git a/site/plugins/admin/classes/FieldsetsManager.php b/site/plugins/admin/classes/FieldsetsManager.php index 6b923366..3ed007e7 100644 --- a/site/plugins/admin/classes/FieldsetsManager.php +++ b/site/plugins/admin/classes/FieldsetsManager.php @@ -45,7 +45,7 @@ class FieldsetsManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -59,7 +59,7 @@ class FieldsetsManager Notification::set('success', __('admin_message_fieldset_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -78,7 +78,7 @@ class FieldsetsManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -94,7 +94,7 @@ class FieldsetsManager Notification::set('success', __('admin_message_fieldset_duplicated')); Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -113,7 +113,7 @@ class FieldsetsManager Http::redirect(Http::getBaseUrl() . '/admin/fieldsets/edit?fieldset=' . Http::post('name')); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } diff --git a/site/plugins/admin/classes/MenusManager.php b/site/plugins/admin/classes/MenusManager.php index 02c8bee4..a34dd60f 100644 --- a/site/plugins/admin/classes/MenusManager.php +++ b/site/plugins/admin/classes/MenusManager.php @@ -39,7 +39,7 @@ class MenusManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -53,7 +53,7 @@ class MenusManager Notification::set('success', __('admin_message_menu_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/menus'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -72,7 +72,7 @@ class MenusManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -88,7 +88,7 @@ class MenusManager Notification::set('success', __('admin_message_menu_duplicated')); Http::redirect(Http::getBaseUrl() . '/admin/menus'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -107,7 +107,7 @@ class MenusManager Http::redirect(Http::getBaseUrl() . '/admin/menus/edit?menu=' . Http::post('name')); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } diff --git a/site/plugins/admin/classes/PluginsManager.php b/site/plugins/admin/classes/PluginsManager.php index 670a3b10..07275592 100644 --- a/site/plugins/admin/classes/PluginsManager.php +++ b/site/plugins/admin/classes/PluginsManager.php @@ -25,7 +25,7 @@ class PluginsManager Filesystem::write(PATH['plugins'] . '/' . Http::post('plugin') . '/' . 'settings.yaml', YamlParser::encode($plugin_settings)); Cache::clear(); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } } diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 0b56e9ce..1e64edf8 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -30,7 +30,7 @@ class SettingsManager Notification::set('success', __('admin_message_cache_files_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/settings'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -55,7 +55,7 @@ class SettingsManager Http::redirect(Http::getBaseUrl() . '/admin/settings'); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } diff --git a/site/plugins/admin/classes/SnippetsManager.php b/site/plugins/admin/classes/SnippetsManager.php index 2b9e9d57..9dc1c1ce 100644 --- a/site/plugins/admin/classes/SnippetsManager.php +++ b/site/plugins/admin/classes/SnippetsManager.php @@ -39,7 +39,7 @@ class SnippetsManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -53,7 +53,7 @@ class SnippetsManager Notification::set('success', __('admin_message_snippet_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/snippets'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -72,7 +72,7 @@ class SnippetsManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -88,7 +88,7 @@ class SnippetsManager Notification::set('success', __('admin_message_snippet_duplicated')); Http::redirect(Http::getBaseUrl() . '/admin/snippets'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -107,7 +107,7 @@ class SnippetsManager Http::redirect(Http::getBaseUrl() . '/admin/snippets/edit?snippet=' . Http::post('name')); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } diff --git a/site/plugins/admin/classes/TemplatesManager.php b/site/plugins/admin/classes/TemplatesManager.php index 742f1ac6..29395210 100644 --- a/site/plugins/admin/classes/TemplatesManager.php +++ b/site/plugins/admin/classes/TemplatesManager.php @@ -38,7 +38,7 @@ class TemplatesManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -53,7 +53,7 @@ class TemplatesManager Notification::set('success', __('admin_message_template_deleted')); Http::redirect(Http::getBaseUrl() . '/admin/templates'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -74,7 +74,7 @@ class TemplatesManager } } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -92,7 +92,7 @@ class TemplatesManager Notification::set('success', __('admin_message_template_duplicated')); Http::redirect(Http::getBaseUrl() . '/admin/templates'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } break; @@ -113,7 +113,7 @@ class TemplatesManager Http::redirect(Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::post('name') . '&type=' . $type); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } diff --git a/site/plugins/admin/classes/UsersManager.php b/site/plugins/admin/classes/UsersManager.php index 3c65eedc..836348b5 100644 --- a/site/plugins/admin/classes/UsersManager.php +++ b/site/plugins/admin/classes/UsersManager.php @@ -28,7 +28,7 @@ class UsersManager Session::destroy(); Http::redirect(Http::getBaseUrl() . '/admin'); } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -54,7 +54,7 @@ class UsersManager Http::redirect(Http::getBaseUrl() . '/admin/entries'); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } @@ -97,7 +97,7 @@ class UsersManager Notification::set('error', __('admin_message_wrong_username_password')); } } else { - die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } From 4db6d392eebd78262fcba9df0aaf760d1d400e2f Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 20:51:02 +0300 Subject: [PATCH 0184/1219] Flextype Core: Entries - code fixes according Scrutinizer Tests. --- flextype/Entries.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 4fa2eadc..f3612570 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -150,10 +150,13 @@ class Entries * @param string $url Page url. * @param bool $raw Parse content or raw content without parsing. * @param bool $hidden Get hidden entries. - * @return array|string + * @return array */ public static function getEntry(string $url = '', bool $raw = false, bool $hidden = false) { + // Init Entry + $entry = []; + // If $url is empty then set path for default main entry if ($url === '') { $file_path = PATH['entries'] . '/' . Registry::get('settings.entries.main') . '/entry.html'; @@ -167,7 +170,9 @@ class Entries // Try to get the entry from cache if (Cache::contains($entry_cache_id)) { - return Cache::fetch($entry_cache_id); + if ($entry = Cache::fetch($entry_cache_id)) { + $etnry = $entry; + } } else { // Get raw entry if $raw is true @@ -187,11 +192,12 @@ class Entries } Cache::save($entry_cache_id, $entry); - return $entry; } } else { - return Entries::getError404Entry(); + $entry = Entries::getError404Entry(); } + + return $entry; } /** From 41ce3f003a43838f02fc98527a7b9408804b2c92 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 20:56:21 +0300 Subject: [PATCH 0185/1219] Flextype Core: Entries - code fixes according Scrutinizer Tests. --- flextype/Entries.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index f3612570..d971fcb3 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -170,8 +170,8 @@ class Entries // Try to get the entry from cache if (Cache::contains($entry_cache_id)) { - if ($entry = Cache::fetch($entry_cache_id)) { - $etnry = $entry; + if ($_entry = Cache::fetch($entry_cache_id)) { + $entry = $_entry; } } else { From f99cbe9064c7531d9f41e6160ff7b04597105504 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 22:15:14 +0300 Subject: [PATCH 0186/1219] Flextype Core: Snippets - code fixes according Scrutinizer Tests. - $vars was never initialized. Although not strictly required by PHP, it is generally a good practice to add --- flextype/Snippets.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 78dc5ebb..118d0828 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -29,6 +29,8 @@ class Snippets */ public static function get(string $snippet_name) { + $vars = []; + $vars['get'] = $snippet_name; return Snippets::_snippet($vars); From 5bba56dcd8f1646888fa7218880f8e81bdf4f96f Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 22:18:56 +0300 Subject: [PATCH 0187/1219] Flextype Core: Plugins - code fixes according Scrutinizer Tests. - The variable $plugin_config does not seem to be defined for all execution paths leading up to this point. - The variable $plugin_settings does not seem to be defined for all execution paths leading up to this point. --- flextype/Plugins.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index cce11524..58e0da31 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -259,6 +259,11 @@ class Plugins // If Plugins List isnt empty if (is_array($plugins_list) && count($plugins_list) > 0) { + // Init plugin configs + $_plugins_config = []; + $plugin_settings = []; + $plugin_config = []; + // Go through... foreach ($plugins_list as $plugin) { if (Filesystem::has($_plugin_settings = PATH['plugins'] . '/' . $plugin['dirname'] . '/settings.yaml')) { From f9ac8aba46756f07f45f1ba608b1936a6e7cf116 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 23:01:04 +0300 Subject: [PATCH 0188/1219] Flextype Core: Plugins - code fixes according Scrutinizer Tests. It seems like Flextype\Component\Files...read($_plugin_settings) can also be of type false; however, parameter $input of Flextype\YamlParser::decode() does only seem to accept string, maybe add an additional type check? Fixed --- flextype/Plugins.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 58e0da31..80e16e2d 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -267,11 +267,19 @@ class Plugins // Go through... foreach ($plugins_list as $plugin) { if (Filesystem::has($_plugin_settings = PATH['plugins'] . '/' . $plugin['dirname'] . '/settings.yaml')) { - $plugin_settings = YamlParser::decode(Filesystem::read($_plugin_settings)); + if (($content = Filesystem::read($_plugin_settings)) === false) { + throw new \RuntimeException('Load file: ' . $_plugin_settings . ' - failed!'); + } else { + $plugin_settings = YamlParser::decode($content); + } } if (Filesystem::has($_plugin_config = PATH['plugins'] . '/' . $plugin['dirname'] . '/' . $plugin['dirname'] . '.yaml')) { - $plugin_config = YamlParser::decode(Filesystem::read($_plugin_config)); + if (($content = Filesystem::read($_plugin_config)) === false) { + throw new \RuntimeException('Load file: ' . $_plugin_config . ' - failed!'); + } else { + $plugin_config = YamlParser::decode($content); + } } $_plugins_config[basename($_plugin_config, '.yaml')] = array_merge($plugin_settings, $plugin_config); @@ -288,7 +296,11 @@ class Plugins foreach ($plugins_list as $plugin) { $language_file = PATH['plugins'] . '/' . $plugin['dirname'] . '/languages/' . $locale . '.yaml'; if (Filesystem::has($language_file)) { - I18n::add(YamlParser::decode(Filesystem::read($language_file)), $locale); + if (($content = Filesystem::read($language_file)) === false) { + throw new \RuntimeException('Load file: ' . $language_file . ' - failed!'); + } else { + I18n::add(YamlParser::decode($content), $locale); + } } } } From 2dcb6dc5d57ad549c52bd4208b57b2164d7332ca Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 23:15:10 +0300 Subject: [PATCH 0189/1219] Flextype Core: Flextype - code fixes according Scrutinizer Tests. It seems like Flextype\Component\Files...ult_settings_file_path) can also be of type false; however, parameter $input of Flextype\YamlParser::decode() does only seem to accept string, maybe add an additional type check? Fixed --- flextype/Flextype.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/flextype/Flextype.php b/flextype/Flextype.php index eb98cccf..fb7b3875 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -154,9 +154,20 @@ class Flextype // Set settings if Flextype settings and Site settings config files exist if (Filesystem::has($default_settings_file_path) && Filesystem::has($site_settings_file_path)) { - // Get Flextype settings and Site settings - $default_settings = YamlParser::decode(Filesystem::read($default_settings_file_path)); - $site_settings = YamlParser::decode(Filesystem::read($site_settings_file_path)); + $default_settings = []; + $site_settings = []; + + if (($content = Filesystem::read($default_settings_file_path)) === false) { + throw new \RuntimeException('Load file: ' . $default_settings_file_path . ' - failed!'); + } else { + $default_settings = YamlParser::decode($content); + } + + if (($content = Filesystem::read($site_settings_file_path)) === false) { + throw new \RuntimeException('Load file: ' . $site_settings_file_path . ' - failed!'); + } else { + $site_settings = YamlParser::decode($content); + } // Merge settings $settings = array_replace_recursive($default_settings, $site_settings); From 0fca416dec83de8ce0270d7e723c0573ac546aa9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 23:19:39 +0300 Subject: [PATCH 0190/1219] Flextype Core: Flextype - code fixes according Scrutinizer Tests. It seems like Flextype\Component\Files...ult_settings_file_path) can also be of type false; however, parameter $input of Flextype\YamlParser::decode() does only seem to accept string, maybe add an additional type check? Fixed --- flextype/Flextype.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flextype/Flextype.php b/flextype/Flextype.php index fb7b3875..6daefbfe 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -151,12 +151,12 @@ class Flextype $default_settings_file_path = PATH['config']['default'] . '/settings.yaml'; $site_settings_file_path = PATH['config']['site'] . '/settings.yaml'; + $default_settings = []; + $site_settings = []; + // Set settings if Flextype settings and Site settings config files exist if (Filesystem::has($default_settings_file_path) && Filesystem::has($site_settings_file_path)) { - $default_settings = []; - $site_settings = []; - if (($content = Filesystem::read($default_settings_file_path)) === false) { throw new \RuntimeException('Load file: ' . $default_settings_file_path . ' - failed!'); } else { From f698739626553e447aa0a40ba606602427eabe64 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 23:58:39 +0300 Subject: [PATCH 0191/1219] Flextype Core: Flextype - code fixes according Scrutinizer Tests. It seems like Flextype\Component\Files...ult_settings_file_path) can also be of type false; however, parameter $input of Flextype\YamlParser::decode() does only seem to accept string, maybe add an additional type check? Fixed --- flextype/Flextype.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 6daefbfe..eef334fb 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -151,9 +151,6 @@ class Flextype $default_settings_file_path = PATH['config']['default'] . '/settings.yaml'; $site_settings_file_path = PATH['config']['site'] . '/settings.yaml'; - $default_settings = []; - $site_settings = []; - // Set settings if Flextype settings and Site settings config files exist if (Filesystem::has($default_settings_file_path) && Filesystem::has($site_settings_file_path)) { From 1ca988fabeb4aac7799e7050fda4d940d1a44e77 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 23:59:56 +0300 Subject: [PATCH 0192/1219] Flextype Core: Cache - code fixes according Scrutinizer Tests. The class Doctrine\Common\Cache\XcacheCache has been deprecated. The class Doctrine\Common\Cache\MemcacheCache has been deprecated. --- flextype/Cache.php | 17 ----------------- site/plugins/admin/classes/SettingsManager.php | 2 -- .../views/templates/system/settings/list.php | 10 ---------- 3 files changed, 29 deletions(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index b1ff2b48..124111cf 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -121,8 +121,6 @@ class Cache if (!$driver_name || $driver_name == 'auto') { if (extension_loaded('apcu')) { $driver_name = 'apcu'; - } elseif (extension_loaded('apc')) { - $driver_name = 'apc'; } elseif (extension_loaded('wincache')) { $driver_name = 'wincache'; } elseif (extension_loaded('xcache')) { @@ -133,11 +131,6 @@ class Cache } switch ($driver_name) { - // The ApcCache driver uses the apc_fetch, apc_exists, etc. functions - // that come with PHP so no additional setup is required in order to use it. - case 'apc': - $driver = new DoctrineCache\ApcCache(); - break; // The ApcuCache driver uses the apcu_fetch, apcu_exists, etc. functions // that come with PHP so no additional setup is required in order to use it. case 'apcu': @@ -159,16 +152,6 @@ class Cache case 'xcache': $driver = new DoctrineCache\XcacheCache(); break; - // The MemcacheCache drivers stores the cache data in Memcache. - case 'memcache': - $memcache = new \Memcache(); - $memcache->connect( - Registry::get('settings.cache.memcache.server', 'localhost'), - Registry::get('settings.cache.memcache.port', 11211) - ); - $driver = new DoctrineCache\MemcacheCache(); - $driver->setMemcache($memcache); - break; // The MemcachedCache drivers stores the cache data in Memcached. case 'memcached': $memcached = new \Memcached(); diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 1e64edf8..3e128f14 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -86,11 +86,9 @@ class SettingsManager $cache_driver = ['auto' => 'Auto Detect', 'file' => 'File', - 'apc' => 'APC', 'apcu' => 'APCu', 'wincache' => 'WinCache', 'xcache' => 'Xcache', - 'memcache' => 'Memcache', 'memcached' => 'Memcached', 'redis' => 'Redis', 'sqlite3' => 'SQLite3', diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php index 5aa0c2a4..592da4b4 100644 --- a/site/plugins/admin/views/templates/system/settings/list.php +++ b/site/plugins/admin/views/templates/system/settings/list.php @@ -196,16 +196,6 @@ Themes::view('admin/views/partials/content-start')->display(); 'form-control', 'id' => 'systemSettingsSystemCacheLifetime', 'required']) ?>
-
-
- 'systemSettingsSystemCacheMemcacheServer']) ?> - 'form-control', 'id' => 'systemSettingsSystemCacheMemcacheServer', 'required']) ?> -
-
- 'systemSettingsSystemCacheMemcachePort']) ?> - 'form-control', 'id' => 'systemSettingsSystemCacheMemcachePort', 'required']) ?> -
-
'systemSettingsSystemCacheMemcachedServer']) ?> From 4add45375069db424ea7194d74978f69f2395047 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 00:32:57 +0300 Subject: [PATCH 0193/1219] Flextype Core: Shortcodes - Refactoring - Shortcodes moved into folder /shortcodes/ - Method addDefaultShortcodes() fixed according to Scrutinizer tests. --- flextype/Shortcodes.php | 100 ++------------------- flextype/shortcodes/ImagesShortcode.php | 61 +++++++++++++ flextype/shortcodes/ImagesUrlShortcode.php | 54 +++++++++++ flextype/shortcodes/SiteUrlShortcode.php | 22 +++++ flextype/shortcodes/SnippetsShortcode.php | 22 +++++ 5 files changed, 166 insertions(+), 93 deletions(-) create mode 100644 flextype/shortcodes/ImagesShortcode.php create mode 100644 flextype/shortcodes/ImagesUrlShortcode.php create mode 100644 flextype/shortcodes/SiteUrlShortcode.php create mode 100644 flextype/shortcodes/SnippetsShortcode.php diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 11ad824f..49319b71 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -12,8 +12,8 @@ namespace Flextype; -use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; +use Flextype\Component\Filesystem\Filesystem; use Thunder\Shortcode\ShortcodeFacade; use Thunder\Shortcode\Shortcode\ShortcodeInterface; @@ -114,99 +114,13 @@ class Shortcodes { */ private static function addDefaultShortcodes() : void { - // Shortcode: [site_url] - Shortcodes::shortcode()->addHandler('site_url', function() { - return Http::getBaseUrl(); - }); + // Get Default Shortocdes List + $shortcodes_list = Filesystem::listContents(ROOT_DIR . '/flextype/shortcodes'); - // Snippets - // Shortcode: [snippets get=snippet-name] - Shortcodes::shortcode()->addHandler('snippets', function(ShortcodeInterface $s) { - return Snippets::get($s->getParameter('get')); - }); - - // Images - // Shortcode: [images path="home/image.jpg"] - // Result: Display image - Shortcodes::shortcode()->addHandler('images', function(ShortcodeInterface $s) { - $params = []; - $attributes = []; - - // API - // http://glide.thephpleague.com/1.0/api/quick-reference/ - ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); - ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); - ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); - ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); - ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); - ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); - ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); - ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); - ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); - ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); - ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); - ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); - ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); - ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); - ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); - ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); - ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); - ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); - ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); - ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); - ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); - ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); - ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); - ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); - ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); - ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); - - ($s->getParameter('width')) and $attributes['width'] = $s->getParameter('width'); - ($s->getParameter('height')) and $attributes['height'] = $s->getParameter('height'); - ($s->getParameter('class')) and $attributes['class'] = $s->getParameter('class'); - ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); - ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); - - return Images::getImage($s->getParameter('path'), $params, $attributes); - }); - - // Images - // Shortcode: [images_url path="home/image.jpg"] - // Result: Display image url - Shortcodes::shortcode()->addHandler('images_url', function(ShortcodeInterface $s) { - $params = []; - - // API - // http://glide.thephpleague.com/1.0/api/quick-reference/ - ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); - ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); - ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); - ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); - ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); - ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); - ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); - ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); - ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); - ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); - ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); - ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); - ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); - ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); - ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); - ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); - ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); - ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); - ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); - ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); - ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); - ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); - ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); - ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); - ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); - ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); - - return Images::getImageUrl($s->getParameter('path'), $params); - }); + // Include default shortcodes + foreach ($shortcodes_list as $shortcode) { + include_once $shortcode['path']; + } } /** diff --git a/flextype/shortcodes/ImagesShortcode.php b/flextype/shortcodes/ImagesShortcode.php new file mode 100644 index 00000000..041372a7 --- /dev/null +++ b/flextype/shortcodes/ImagesShortcode.php @@ -0,0 +1,61 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +use Thunder\Shortcode\ShortcodeFacade; +use Thunder\Shortcode\Shortcode\ShortcodeInterface; + +// Images +// Shortcode: [images path="home/image.jpg"] +// Result: Display image +Shortcodes::shortcode()->addHandler('images', function(ShortcodeInterface $s) { + $params = []; + $attributes = []; + + // API + // http://glide.thephpleague.com/1.0/api/quick-reference/ + ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); + ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); + ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); + ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); + ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); + ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); + ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); + ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); + ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); + ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); + ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); + ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); + ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); + ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); + ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); + ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); + ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); + ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); + ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); + ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); + ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); + ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); + ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); + ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); + ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); + ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); + + ($s->getParameter('width')) and $attributes['width'] = $s->getParameter('width'); + ($s->getParameter('height')) and $attributes['height'] = $s->getParameter('height'); + ($s->getParameter('class')) and $attributes['class'] = $s->getParameter('class'); + ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); + ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); + + return Images::getImage($s->getParameter('path'), $params, $attributes); +}); diff --git a/flextype/shortcodes/ImagesUrlShortcode.php b/flextype/shortcodes/ImagesUrlShortcode.php new file mode 100644 index 00000000..f22fc54d --- /dev/null +++ b/flextype/shortcodes/ImagesUrlShortcode.php @@ -0,0 +1,54 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +use Thunder\Shortcode\ShortcodeFacade; +use Thunder\Shortcode\Shortcode\ShortcodeInterface; + +// Images +// Shortcode: [images_url path="home/image.jpg"] +// Result: Display image url +Shortcodes::shortcode()->addHandler('images_url', function(ShortcodeInterface $s) { + $params = []; + + // API + // http://glide.thephpleague.com/1.0/api/quick-reference/ + ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); + ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); + ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); + ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); + ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); + ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); + ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); + ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); + ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); + ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); + ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); + ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); + ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); + ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); + ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); + ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); + ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); + ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); + ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); + ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); + ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); + ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); + ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); + ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); + ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); + ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); + + return Images::getImageUrl($s->getParameter('path'), $params); +}); diff --git a/flextype/shortcodes/SiteUrlShortcode.php b/flextype/shortcodes/SiteUrlShortcode.php new file mode 100644 index 00000000..bc143c99 --- /dev/null +++ b/flextype/shortcodes/SiteUrlShortcode.php @@ -0,0 +1,22 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +use Flextype\Component\Http\Http; +use Thunder\Shortcode\ShortcodeFacade; +use Thunder\Shortcode\Shortcode\ShortcodeInterface; + +// Shortcode: [site_url] +Shortcodes::shortcode()->addHandler('site_url', function() { + return Http::getBaseUrl(); +}); diff --git a/flextype/shortcodes/SnippetsShortcode.php b/flextype/shortcodes/SnippetsShortcode.php new file mode 100644 index 00000000..20f440b2 --- /dev/null +++ b/flextype/shortcodes/SnippetsShortcode.php @@ -0,0 +1,22 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +use Thunder\Shortcode\ShortcodeFacade; +use Thunder\Shortcode\Shortcode\ShortcodeInterface; + +// Snippets +// Shortcode: [snippets get=snippet-name] +Shortcodes::shortcode()->addHandler('snippets', function(ShortcodeInterface $s) { + return Snippets::get($s->getParameter('get')); +}); From 7c77e0ff90b08593fe7b99e7b1d2c96a852dfa06 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 00:42:41 +0300 Subject: [PATCH 0194/1219] Flextype Core: Cache - code fixes according Scrutinizer Tests. The class Doctrine\Common\Cache\XcacheCache has been deprecated. --- flextype/Cache.php | 7 ------- site/plugins/admin/classes/SettingsManager.php | 1 - 2 files changed, 8 deletions(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 124111cf..445bef4b 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -123,8 +123,6 @@ class Cache $driver_name = 'apcu'; } elseif (extension_loaded('wincache')) { $driver_name = 'wincache'; - } elseif (extension_loaded('xcache')) { - $driver_name = 'xcache'; } else { $driver_name = 'file'; } @@ -147,11 +145,6 @@ class Cache case 'wincache': $driver = new DoctrineCache\WinCacheCache(); break; - // The XcacheCache driver uses functions that come with the xcache extension - // https://xcache.lighttpd.net - case 'xcache': - $driver = new DoctrineCache\XcacheCache(); - break; // The MemcachedCache drivers stores the cache data in Memcached. case 'memcached': $memcached = new \Memcached(); diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 3e128f14..44e25943 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -88,7 +88,6 @@ class SettingsManager 'file' => 'File', 'apcu' => 'APCu', 'wincache' => 'WinCache', - 'xcache' => 'Xcache', 'memcached' => 'Memcached', 'redis' => 'Redis', 'sqlite3' => 'SQLite3', From 8d019c74daeb074437b267136f4a45dabe0ceafc Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 00:44:01 +0300 Subject: [PATCH 0195/1219] Admin Panel: translates updates --- site/plugins/admin/languages/en_US.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index 18045f14..d59a8d5c 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -172,8 +172,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From efbf40319a951391516e98612f6fdee5cc765c72 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:15 +0300 Subject: [PATCH 0196/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 33267395ee2e3a203df283a3ddeb372867f994dd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:16 +0300 Subject: [PATCH 0197/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From a29fe84038b5aa715962150ee56a24a68a355250 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:18 +0300 Subject: [PATCH 0198/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 59529c4e..3e70e2a6 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From c52e9ae35d4c05533c1f3f4f47b98b1b3a01e520 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:20 +0300 Subject: [PATCH 0199/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 30eb18fd..5c66f0c5 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Yönetim Paneli" admin_light: "Aydınlık" admin_dark: "Karanlık" admin_name: "Ad" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From c27da371d2b2e33f2b8cb63db3b2d5f937ebb140 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:21 +0300 Subject: [PATCH 0200/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 010b2fbbff0a57921e5eda51a8c2c051315d64b9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:23 +0300 Subject: [PATCH 0201/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 1c50e614eb2865ec2386b0c0d54ef1964a97de11 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:24 +0300 Subject: [PATCH 0202/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From b48c860ff435be554e0a963c120c89a706d890c5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:25 +0300 Subject: [PATCH 0203/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index aecf20e7..4110159f 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Админ панель" admin_light: "Светлый" admin_dark: "Темный" admin_name: "Название" -admin_memcache_server: "Сервер Memcache" -admin_memcache_port: "Порт Memcache" admin_memcached_server: "Сервер Memcache" admin_memcached_port: "Порт Memcache" admin_redis_socket: "Сокет Redis" From 8b1ee250c0a2b408d88fa68eb09af3654aa823c4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:27 +0300 Subject: [PATCH 0204/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 1eb6a5670ba5d124ffcbf844fb8a6f8dbc053035 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:29 +0300 Subject: [PATCH 0205/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 89955356..4cb778be 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From de35bd09a83ac4fc5ca9ba614e022d918bfc28d4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:30 +0300 Subject: [PATCH 0206/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 1a461154f6c48a9e17b3e712ff0d16bf8c23f589 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:31 +0300 Subject: [PATCH 0207/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 3f506bb0..c27d62d3 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Panel administratora" admin_light: "Jasny" admin_dark: "Ciemny" admin_name: "Nazwa" -admin_memcache_server: "Serwer Memcache" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Serwer" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 791606da4095be99ab7efd38a6742a2d5f82798d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:33 +0300 Subject: [PATCH 0208/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 61683e7b026b3e81e8b8c11171263ac2b0f7c292 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:34 +0300 Subject: [PATCH 0209/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From a18f768cfdc7eb9ba2d2cc8c147067ca84e9067b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:36 +0300 Subject: [PATCH 0210/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 858df245..d86dd99f 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 1498f0d38936a09bf1cc990b848c6cfbc8be420c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:37 +0300 Subject: [PATCH 0211/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From df58b40e5973120e2493d484b0b1ed8d6ee2d6e4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:39 +0300 Subject: [PATCH 0212/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From ad710eafcbc27ddb090e84974710bf178f759c2f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:40 +0300 Subject: [PATCH 0213/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From a67f915d2e14175cfe2986188568ab93779e8167 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:42 +0300 Subject: [PATCH 0214/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 210defd08dbedcb1f324740948f92578f8269bd8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:43 +0300 Subject: [PATCH 0215/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index e7dee876..c4d3ef82 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Hell" admin_dark: "Dunkel" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 77553e2d1630fa66106ddc38701175d329341d42 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:45 +0300 Subject: [PATCH 0216/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From b8342004ba02887b780ec4d2b196cb46d82e4385 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:46 +0300 Subject: [PATCH 0217/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 0a0270cfaab71c86af8850bf50097558d6601d0f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:48 +0300 Subject: [PATCH 0218/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 8e222292..52c0904b 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From ef513332698bede4da5244a469fc2c8287c54e41 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:49 +0300 Subject: [PATCH 0219/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 6a7d1ed04abec95f53e9e1228739026ecdc9e30e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:50 +0300 Subject: [PATCH 0220/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 45ca8bee..6d2ab9c3 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Jméno" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 3e229f8ae3b405bfc2266b53bfebb8a651e14357 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:52 +0300 Subject: [PATCH 0221/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 2dc81b8c..9d607210 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Administratorsko sučelje" admin_light: "Svjetla" admin_dark: "Tamna" admin_name: "Ime" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 87644ade45fdbf5e0a0caa49a3cb50c069272bfd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:53 +0300 Subject: [PATCH 0222/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 5b728171674831052f674ec358b46aae1b9281f9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:55 +0300 Subject: [PATCH 0223/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 0bfcd6f975c5914619c72a54701a5c6b8d9fe81d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:56 +0300 Subject: [PATCH 0224/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From d82da1db1775d627c6c02741503081da64a22372 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 00:44:57 +0300 Subject: [PATCH 0225/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index 1395394e..ccb14943 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -173,8 +173,6 @@ admin_admin_panel: "Admin Panel" admin_light: "Light" admin_dark: "Dark" admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" admin_memcached_port: "Memcached Port" admin_redis_socket: "Redis Socket" From 55062c96239161baf6b009fa25c826756ac22b2d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 01:14:12 +0300 Subject: [PATCH 0226/1219] Flextype Core: Cache - code fixes and refactoring according to Scrutinizer Tests. --- flextype/Cache.php | 254 ++++++++++++++++++++++++++++++++------------- 1 file changed, 182 insertions(+), 72 deletions(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 445bef4b..26839490 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -114,10 +114,190 @@ class Cache */ public static function getCacheDriver() { - $driver_name = Registry::get('settings.cache.driver'); + // Try to set default cache driver name + // Set cache driver + return Cache::setCacheDriver(Cache::setDefaultCacheDriverName(Registry::get('settings.cache.driver'))); + } + protected static function setCacheDriver(string $driver_name) + { + switch ($driver_name) { + case 'apcu': + $driver = Cache::setApcuCacheDriver(); + break; + case 'array': + $driver = Cache::setArrayCacheDriver(); + break; + case 'wincache': + $driver = Cache::setWinCacheDriver(); + break; + case 'memcached': + $driver = Cache::setMemcachedCacheDriver(); + break; + case 'sqlite3': + $driver = Cache::setSQLite3CacheDriver(); + break; + case 'zend': + $driver = setZendDataCacheDriver(); + break; + case 'redis': + $driver = Cache::setRedisCacheDriver(); + break; + default: + $driver = Cache::setFilesystemCacheDriver(); + break; + } + + return $driver; + } + + /** + * The ZendDataCache driver uses the Zend Data Cache API available in the Zend Platform. + * + * @access protected + */ + protected static function setZendDataCacheDriver() + { + $driver = new DoctrineCache\ZendDataCache(); + + return $driver; + } + + /** + * The SQLite3Cache driver stores the cache data in a SQLite database and depends on the sqlite3 extension + * http://php.net/manual/en/book.sqlite3.php + * + * @access protected + */ + protected static function setSQLite3CacheDriver() + { + // Cache directory $cache_directory = PATH['cache'] . '/doctrine/'; + // Create doctrine cache directory if its not exists + !Filesystem::has($cache_directory) and Filesystem::createDir($cache_directory); + + $db = new \SQLite3($cache_directory . Registry::get('settings.cache.sqlite3.database', 'flextype') . '.db'); + $driver = new DoctrineCache\SQLite3Cache($db, Registry::get('settings.cache.sqlite3.table', 'flextype')); + + return $driver; + } + + /** + * The MemcachedCache drivers stores the cache data in Memcached. + * + * @access protected + */ + protected static function setMemcachedCacheDriver() + { + $memcached = new \Memcached(); + $memcached->addServer( + Registry::get('settings.cache.memcached.server', 'localhost'), + Registry::get('settings.cache.memcache.port', 11211) + ); + $driver = new DoctrineCache\MemcachedCache(); + $driver->setMemcached($memcached); + + return $driver; + } + + /** + * The WinCacheCache driver uses the wincache_ucache_get, wincache_ucache_exists, etc. functions + * that come with the wincache extension + * http://php.net/manual/en/book.wincache.php + * + * @access protected + */ + protected static function setWinCacheDriver() + { + $driver = new DoctrineCache\WinCacheCache(); + + return $driver; + } + + /** + * The ArrayCache driver stores the cache data in PHPs memory and is not persisted anywhere. + * This can be useful for caching things in memory for a single process when you don't need the cache to be persistent across processes. + * @access protected + */ + protected static function setArrayCacheDriver() + { + $driver = new DoctrineCache\ArrayCache(); + + return $driver; + } + + /** + * The ApcuCache driver uses the apcu_fetch, apcu_exists, etc. functions + * that come with PHP so no additional setup is required in order to use it. + * + * @access protected + */ + protected static function setApcuCacheDriver() + { + $driver = new DoctrineCache\ApcuCache(); + + return $driver; + } + + /** + * The RedisCache driver stores the cache data in Redis and depends on the phpredis extension + * https://github.com/phpredis/phpredis + * + * @access protected + */ + protected static function setRedisCacheDriver() + { + $redis = new \Redis(); + $socket = Registry::get('settings.cache.redis.socket', false); + $password = Registry::get('settings.cache.redis.password', false); + + if ($socket) { + $redis->connect($socket); + } else { + $redis->connect( + Registry::get('settings.cache.redis.server', 'localhost'), + Registry::get('settings.cache.redis.port', 6379) + ); + } + + // Authenticate with password if set + if ($password && !$redis->auth($password)) { + throw new \RedisException('Redis authentication failed'); + } + + $driver = new DoctrineCache\RedisCache(); + $driver->setRedis($redis); + + return $driver; + } + + /** + * Filesystem cache Driver + * + * @access protected + */ + protected static function setFilesystemCacheDriver() + { + // Cache directory + $cache_directory = PATH['cache'] . '/doctrine/'; + + // Create doctrine cache directory if its not exists + !Filesystem::has($cache_directory) and Filesystem::createDir($cache_directory); + $driver = new DoctrineCache\FilesystemCache($cache_directory); + + return $driver; + } + + /** + * Set Default Cache Driver Name + * + * @access protected + * @param string $driver_name Driver name. + * @return string + */ + protected static function setDefaultCacheDriverName(string $driver_name) + { if (!$driver_name || $driver_name == 'auto') { if (extension_loaded('apcu')) { $driver_name = 'apcu'; @@ -128,77 +308,7 @@ class Cache } } - switch ($driver_name) { - // The ApcuCache driver uses the apcu_fetch, apcu_exists, etc. functions - // that come with PHP so no additional setup is required in order to use it. - case 'apcu': - $driver = new DoctrineCache\ApcuCache(); - break; - // The ArrayCache driver stores the cache data in PHPs memory and is not persisted anywhere. - // This can be useful for caching things in memory for a single process when you don't need the cache to be persistent across processes. - case 'array': - $driver = new DoctrineCache\ArrayCache(); - break; - // The WinCacheCache driver uses the wincache_ucache_get, wincache_ucache_exists, etc. functions - // that come with the wincache extension - // http://php.net/manual/en/book.wincache.php - case 'wincache': - $driver = new DoctrineCache\WinCacheCache(); - break; - // The MemcachedCache drivers stores the cache data in Memcached. - case 'memcached': - $memcached = new \Memcached(); - $memcached->addServer( - Registry::get('settings.cache.memcached.server', 'localhost'), - Registry::get('settings.cache.memcache.port', 11211) - ); - $driver = new DoctrineCache\MemcachedCache(); - $driver->setMemcached($memcached); - break; - // The SQLite3Cache driver stores the cache data in a SQLite database and depends on the sqlite3 extension - // http://php.net/manual/en/book.sqlite3.php - case 'sqlite3': - // Create doctrine cache directory if its not exists - !Filesystem::has($cache_directory) and Filesystem::createDir($cache_directory); - - $db = new \SQLite3($cache_directory . Registry::get('settings.cache.sqlite3.database', 'flextype') . '.db'); - $driver = new DoctrineCache\SQLite3Cache($db, Registry::get('settings.cache.sqlite3.table', 'flextype')); - break; - // The ZendDataCache driver uses the Zend Data Cache API available in the Zend Platform. - case 'zend': - $driver = new DoctrineCache\ZendDataCache(); - break; - // The RedisCache driver stores the cache data in Redis and depends on the phpredis extension - // https://github.com/phpredis/phpredis - case 'redis': - $redis = new \Redis(); - $socket = Registry::get('settings.cache.redis.socket', false); - $password = Registry::get('settings.cache.redis.password', false); - - if ($socket) { - $redis->connect($socket); - } else { - $redis->connect( - Registry::get('settings.cache.redis.server', 'localhost'), - Registry::get('settings.cache.redis.port', 6379) - ); - } - - // Authenticate with password if set - if ($password && !$redis->auth($password)) { - throw new \RedisException('Redis authentication failed'); - } - - $driver = new DoctrineCache\RedisCache(); - $driver->setRedis($redis); - break; - default: - // Create doctrine cache directory if its not exists - !Filesystem::has($cache_directory) and Filesystem::createDir($cache_directory); - $driver = new DoctrineCache\FilesystemCache($cache_directory); - break; - } - return $driver; + return $driver_name; } /** From 3167ac53e796ab8e7539195cbb7c1a96bba84cfa Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 01:19:19 +0300 Subject: [PATCH 0227/1219] Flextype Core: Cache - code fixes and refactoring according to Scrutinizer Tests. --- flextype/Cache.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 26839490..afd9720a 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -115,8 +115,10 @@ class Cache public static function getCacheDriver() { // Try to set default cache driver name + $driver_name = Cache::setDefaultCacheDriverName(Registry::get('settings.cache.driver')); + // Set cache driver - return Cache::setCacheDriver(Cache::setDefaultCacheDriverName(Registry::get('settings.cache.driver'))); + return Cache::setCacheDriver($driver_name); } protected static function setCacheDriver(string $driver_name) @@ -138,7 +140,7 @@ class Cache $driver = Cache::setSQLite3CacheDriver(); break; case 'zend': - $driver = setZendDataCacheDriver(); + $driver = Cache::setZendDataCacheDriver(); break; case 'redis': $driver = Cache::setRedisCacheDriver(); From 71ad42d51256c9fdc0b8f7d3b7c9ff20e2d0f781 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 01:48:37 +0300 Subject: [PATCH 0228/1219] Admin Panel: Admin - code fixes and refactoring according to Scrutinizer Tests. --- site/plugins/admin/admin.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index 55666c24..1216e71d 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -13,21 +13,11 @@ namespace Flextype; * file that was distributed with this source code. */ -use Flextype\Component\Arr\Arr; -use Flextype\Component\Number\Number; use Flextype\Component\I18n\I18n; use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; -use Flextype\Component\Filesystem\Filesystem; -use Flextype\Component\Session\Session; use Flextype\Component\Registry\Registry; -use Flextype\Component\Token\Token; -use Flextype\Component\Text\Text; -use Flextype\Component\Notification\Notification; -use Flextype\Component\Form\Form; use function Flextype\Component\I18n\__; -use Symfony\Component\Yaml\Yaml; -use Gajus\Dindent\Indenter; // // If isAdminArea From eae0f6802b5f4c5b9148574612873a7de0b6a40d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 01:52:16 +0300 Subject: [PATCH 0229/1219] Admin Panel: Admin - code fixes and refactoring according to Scrutinizer Tests. --- site/plugins/admin/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index 1216e71d..f8d25a71 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -17,6 +17,7 @@ use Flextype\Component\I18n\I18n; use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; use Flextype\Component\Registry\Registry; +use Flextype\Component\Notification\Notification; use function Flextype\Component\I18n\__; // From 07dcf82447a2394cd323fbb2bff48326d1603474 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:04:21 +0300 Subject: [PATCH 0230/1219] .travis updates --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f22fffd..6848b35d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,8 @@ language: php - php: - - 7.1.3 + - 7.1 - 7.2 - 7.3 - branches: only: - dev From 5216bd9907d74cd87ea9b5748875d7de0c371618 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:29:33 +0300 Subject: [PATCH 0231/1219] Admin Panel: Menus Manager - removed for now. We will try to have fields for menus inside menu sections. --- site/menus/.gitkeep | 0 site/menus/default.yaml | 14 -- site/plugins/admin/admin.php | 1 - site/plugins/admin/classes/MenusManager.php | 136 ------------------ site/plugins/admin/languages/en_US.yaml | 8 -- .../views/templates/extends/menus/add.php | 47 ------ .../views/templates/extends/menus/edit.php | 49 ------- .../views/templates/extends/menus/list.php | 60 -------- .../views/templates/extends/menus/rename.php | 44 ------ 9 files changed, 359 deletions(-) delete mode 100755 site/menus/.gitkeep delete mode 100644 site/menus/default.yaml delete mode 100644 site/plugins/admin/classes/MenusManager.php delete mode 100644 site/plugins/admin/views/templates/extends/menus/add.php delete mode 100644 site/plugins/admin/views/templates/extends/menus/edit.php delete mode 100644 site/plugins/admin/views/templates/extends/menus/list.php delete mode 100644 site/plugins/admin/views/templates/extends/menus/rename.php diff --git a/site/menus/.gitkeep b/site/menus/.gitkeep deleted file mode 100755 index e69de29b..00000000 diff --git a/site/menus/default.yaml b/site/menus/default.yaml deleted file mode 100644 index 36f6822c..00000000 --- a/site/menus/default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -title: Default -items: - home: - title: 'Home' - url: 'home' - order: 1 - blog: - title: 'Blog' - url: 'blog' - order: 2 - about: - title: 'About' - url: 'about' - order: 3 diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index f8d25a71..1f00fb22 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -38,7 +38,6 @@ if (Admin::isAdminArea()) { // Add navigation links NavigationManager::addItem('content', 'entries', '' . __('admin_entries', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/entries', ['class' => 'nav-link']); - NavigationManager::addItem('extends', 'menus', '' . __('admin_menus', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/menus', ['class' => 'nav-link']); NavigationManager::addItem('extends', 'fieldsets', '' . __('admin_fieldsets', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/fieldsets', ['class' => 'nav-link']); NavigationManager::addItem('extends', 'templates', '' . __('admin_templates', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/templates', ['class' => 'nav-link']); NavigationManager::addItem('extends', 'snippets', '' . __('admin_snippets', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/snippets', ['class' => 'nav-link']); diff --git a/site/plugins/admin/classes/MenusManager.php b/site/plugins/admin/classes/MenusManager.php deleted file mode 100644 index a34dd60f..00000000 --- a/site/plugins/admin/classes/MenusManager.php +++ /dev/null @@ -1,136 +0,0 @@ - Http::post('title')]) - )) { - Notification::set('success', __('admin_message_menu_created')); - Http::redirect(Http::getBaseUrl() . '/admin/menus'); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/menus/add') - ->display(); - break; - case 'delete': - if (Http::get('menu') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::delete(PATH['menus'] . '/' . Http::get('menu') . '.yaml'); - Notification::set('success', __('admin_message_menu_deleted')); - Http::redirect(Http::getBaseUrl() . '/admin/menus'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - break; - case 'rename': - $rename_menu = Http::post('rename_menu'); - - if (isset($rename_menu)) { - if (Token::check((Http::post('token')))) { - if (!Filesystem::has(PATH['menus'] . '/' . Http::post('name') . '.yaml')) { - if (rename( - PATH['menus'] . '/' . Http::post('name_current') . '.yaml', - PATH['menus'] . '/' . Http::post('name') . '.yaml') - ) { - Notification::set('success', __('admin_message_menu_renamed')); - Http::redirect(Http::getBaseUrl() . '/admin/menus'); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/menus/rename') - ->assign('name_current', Http::get('menu')) - ->display(); - break; - case 'duplicate': - if (Http::get('menu') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::copy(PATH['menus'] . '/' . Http::get('menu') . '.yaml', - PATH['menus'] . '/' . Http::get('menu') . '-duplicate-' . date("Ymd_His") . '.yaml'); - Notification::set('success', __('admin_message_menu_duplicated')); - Http::redirect(Http::getBaseUrl() . '/admin/menus'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - break; - case 'edit': - $action = Http::post('action'); - - if (isset($action) && $action == 'save-form') { - if (Token::check((Http::post('token')))) { - - // Save a menu! - if (Filesystem::write( - PATH['menus'] . '/' . Http::post('name') . '.yaml', - Http::post('menu') - )) { - Notification::set('success', __('admin_message_menu_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/menus/edit?menu=' . Http::post('name')); - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/menus/edit') - ->assign('menu', Filesystem::read(PATH['menus'] . '/' . Http::get('menu') . '.yaml')) - ->display(); - break; - default: - $menus = []; - $menus_list = []; - - $menus = Filesystem::getFilesList(PATH['menus'], 'yaml'); - - if (count($menus) > 0) { - foreach ($menus as $menu) { - $menus_list[basename($menu, '.yaml')] = YamlParser::decode(Filesystem::read($menu)); - } - } - - Themes::view('admin/views/templates/extends/menus/list') - ->assign('menus_list', $menus_list) - ->display(); - break; - } - } -} diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index d59a8d5c..3f65de6b 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -29,7 +29,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -106,14 +105,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -135,11 +132,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" diff --git a/site/plugins/admin/views/templates/extends/menus/add.php b/site/plugins/admin/views/templates/extends/menus/add.php deleted file mode 100644 index 72141cec..00000000 --- a/site/plugins/admin/views/templates/extends/menus/add.php +++ /dev/null @@ -1,47 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'menus' => [ - 'link' => Http::getBaseUrl() . '/admin/menus', - 'title' => __('admin_menus'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'menus_add' => [ - 'link' => Http::getBaseUrl() . '/admin/menus/add', - 'title' => __('admin_create_new_menu'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - -
- 'menuTitle']) ?> - 'form-control', 'id' => 'menuTitle', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
-
- 'menuName']) ?> - 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?> -
-
-
- 'btn btn-black']) ?> - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/menus/edit.php b/site/plugins/admin/views/templates/extends/menus/edit.php deleted file mode 100644 index ae54e4fc..00000000 --- a/site/plugins/admin/views/templates/extends/menus/edit.php +++ /dev/null @@ -1,49 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'menu' => [ - 'link' => Http::getBaseUrl() . '/admin/menus/edit?menu=' . Http::get('menu'), - 'title' => __('admin_menu'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- 'form']) ?> - - - -
-
-
- 'form-control', 'style' => 'min-height:500px;', 'id' => 'codeMirrorEditor']) ?> -
-
-
- -
-
- -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/menus/list.php b/site/plugins/admin/views/templates/extends/menus/list.php deleted file mode 100644 index 479505c4..00000000 --- a/site/plugins/admin/views/templates/extends/menus/list.php +++ /dev/null @@ -1,60 +0,0 @@ - - - -display() ?> -assign('links', [ - 'menus' => [ - 'link' => Http::getBaseUrl() . '/admin/menus', - 'title' => __('admin_menus'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/menus/add', - 'title' => __('admin_create_new_menu'), - 'attributes' => ['class' => 'float-right btn'] - ] - ]) - ->display() -?> -display() ?> - - 0): ?> -
@@ -71,21 +71,21 @@ Themes::view('admin/views/partials/content-start')->display(); diff --git a/site/plugins/admin/views/templates/extends/snippets/list.php b/site/plugins/admin/views/templates/extends/snippets/list.php index c19d44b1..dce6fa2f 100644 --- a/site/plugins/admin/views/templates/extends/snippets/list.php +++ b/site/plugins/admin/views/templates/extends/snippets/list.php @@ -25,7 +25,7 @@ - + @@ -37,17 +37,17 @@ diff --git a/site/plugins/admin/views/templates/extends/templates/list.php b/site/plugins/admin/views/templates/extends/templates/list.php index 579ae03e..f6065018 100644 --- a/site/plugins/admin/views/templates/extends/templates/list.php +++ b/site/plugins/admin/views/templates/extends/templates/list.php @@ -25,7 +25,7 @@
- +
- +
- + diff --git a/site/plugins/admin/views/templates/system/information/list.php b/site/plugins/admin/views/templates/system/information/list.php index 33d6dbf4..f6827b85 100644 --- a/site/plugins/admin/views/templates/system/information/list.php +++ b/site/plugins/admin/views/templates/system/information/list.php @@ -8,7 +8,7 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'information' => [ 'link' => Http::getBaseUrl() . '/admin/information', - 'title' => __('admin_menu_system_information'), + 'title' => __('admin_information'), 'attributes' => ['class' => 'navbar-item active'] ], ]) @@ -16,7 +16,7 @@ Themes::view('admin/views/partials/navbar') Themes::view('admin/views/partials/content-start')->display(); ?> -

+

diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php index 6a097be4..60d30ec3 100644 --- a/site/plugins/admin/views/templates/system/settings/list.php +++ b/site/plugins/admin/views/templates/system/settings/list.php @@ -8,7 +8,7 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'settings' => [ 'link' => Http::getBaseUrl() . '/admin/settings', - 'title' => __('admin_system_settings_heading'), + 'title' => __('admin_settings'), 'attributes' => ['class' => 'navbar-item active'] ] ]) @@ -20,7 +20,7 @@ Themes::view('admin/views/partials/navbar') ], 'settings_clear_cache' => [ 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token='.Token::generate(), - 'title' => __('admin_system_clear_cache'), + 'title' => __('admin_clear_cache'), 'attributes' => ['class' => 'float-right btn'] ] ]) @@ -34,231 +34,231 @@ Themes::view('admin/views/partials/content-start')->display();
-

+


- 'systemSettingsSiteTitle']) ?> + 'systemSettingsSiteTitle']) ?> 'form-control', 'id' => 'systemSettingsSiteTitle', 'required']) ?>
- 'systemSettingsSiteDescription']) ?> + 'systemSettingsSiteDescription']) ?> 'form-control margin-hard-bottom', 'id' => 'systemSettingsSiteDescription']) ?>
- 'systemSettingsSiteKeywords']) ?> + 'systemSettingsSiteKeywords']) ?> 'form-control', 'id' => 'systemSettingsSiteKeywords', 'required']) ?>
- 'systemSettingsSiteRobots']) ?> + 'systemSettingsSiteRobots']) ?> 'form-control', 'id' => 'systemSettingsSiteRobots', 'required']) ?>
- 'systemSettingsSiteAuthorName']) ?> + 'systemSettingsSiteAuthorName']) ?> 'form-control', 'id' => 'systemSettingsSiteAuthorName', 'required']) ?>
- 'systemSettingsSiteAuthorEmail']) ?> + 'systemSettingsSiteAuthorEmail']) ?> 'form-control', 'id' => 'systemSettingsSiteAuthorEmail', 'required']) ?>

-

+


- 'systemSettingsSystemTimezone']) ?> + 'systemSettingsSystemTimezone']) ?> 'form-control', 'id' => 'systemSettingsSystemTimezone', 'required']) ?>
- 'systemSettingsSystemDateFormat']) ?> + 'systemSettingsSystemDateFormat']) ?> 'form-control', 'id' => 'systemSettingsSystemDateFormat', 'required']) ?>
- 'systemSettingsSystemCharset']) ?> + 'systemSettingsSystemCharset']) ?> 'form-control', 'id' => 'systemSettingsSystemCharset', 'required']) ?>
- 'systemSettingsSystemTheme']) ?> + 'systemSettingsSystemTheme']) ?> 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
- 'systemSettingsSystemLocale']) ?> + 'systemSettingsSystemLocale']) ?> 'form-control', 'id' => 'entryTemplate']) ?>
- 'systemSettingsSystemEntriesMain']) ?> + 'systemSettingsSystemEntriesMain']) ?> 'form-control', 'id' => 'systemSettingsSystemEntriesMain', 'required']) ?>

-

+


- 'systemSettingsSystemTheme']) ?> + 'systemSettingsSystemTheme']) ?> 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
- 'systemSettingsSystemTheme']) ?> + 'systemSettingsSystemTheme']) ?> 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
- 'systemSettingsSystemTheme']) ?> + 'systemSettingsSystemTheme']) ?> 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
- 'systemSettingsSystemEntriesMain']) ?> + 'systemSettingsSystemEntriesMain']) ?> 'form-control', 'id' => 'systemSettingsSystemEntriesMain', 'required']) ?>

-

+


- 'systemSettingsSystemEntriesError404Title']) ?> + 'systemSettingsSystemEntriesError404Title']) ?> 'form-control', 'id' => 'systemSettingsSystemEntriesError404Title', 'required']) ?>
- 'systemSettingsSystemEntriesError404Description']) ?> + 'systemSettingsSystemEntriesError404Description']) ?> 'form-control', 'id' => 'systemSettingsSystemEntriesError404Description', 'required']) ?>
- 'systemSettingsSystemEntriesError404Content']) ?> + 'systemSettingsSystemEntriesError404Content']) ?> 'form-control', 'id' => 'systemSettingsSystemEntriesError404Content', 'required']) ?>
- 'systemSettingsSystemEntriesError404Template']) ?> + 'systemSettingsSystemEntriesError404Template']) ?> 'form-control', 'id' => 'systemSettingsSystemEntriesError404Template', 'required']) ?>

-

+


- 'systemSettingsSystemErrorsDisplay']) ?> - __('admin_system_settings_system_errors_enabled_false'), 1 => __('admin_system_settings_system_errors_enabled_true')], $settings['errors']['display'], ['class' => 'form-control', 'id' => 'systemSettingsSystemErrorsDisplay', 'required']) ?> + 'systemSettingsSystemErrorsDisplay']) ?> + __('admin_disabled'), 1 => __('admin_enabled')], $settings['errors']['display'], ['class' => 'form-control', 'id' => 'systemSettingsSystemErrorsDisplay', 'required']) ?>

-

+


- 'systemSettingsSystemCacheEnabled']) ?> - __('admin_system_settings_system_cache_enabled_false'), 1 => __('admin_system_settings_system_cache_enabled_true')], $settings['cache']['enabled'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheEnabled', 'required']) ?> + 'systemSettingsSystemCacheEnabled']) ?> + __('admin_disabled'), 1 => __('admin_enabled')], $settings['cache']['enabled'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheEnabled', 'required']) ?>
- 'systemSettingsSystemCachePrefix']) ?> + 'systemSettingsSystemCachePrefix']) ?> 'form-control', 'id' => 'systemSettingsSystemCachePrefix', 'required']) ?>
- 'systemSettingsSystemCacheDriver']) ?> + 'systemSettingsSystemCacheDriver']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheDriver', 'required']) ?>
- 'systemSettingsSystemCacheLifetime']) ?> + 'systemSettingsSystemCacheLifetime']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheLifetime', 'required']) ?>
- 'systemSettingsSystemCacheMemcacheServer']) ?> + 'systemSettingsSystemCacheMemcacheServer']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheMemcacheServer', 'required']) ?>
- 'systemSettingsSystemCacheMemcachePort']) ?> + 'systemSettingsSystemCacheMemcachePort']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheMemcachePort', 'required']) ?>
- 'systemSettingsSystemCacheMemcachedServer']) ?> + 'systemSettingsSystemCacheMemcachedServer']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheMemcachedServer', 'required']) ?>
- 'systemSettingsSystemCacheMemcachedPort']) ?> + 'systemSettingsSystemCacheMemcachedPort']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheMemcachedPort', 'required']) ?>
- 'systemSettingsSystemCacheRedisSocket']) ?> + 'systemSettingsSystemCacheRedisSocket']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheRedisSocket', 'required']) ?>
- 'systemSettingsSystemCacheRedisPassword']) ?> + 'systemSettingsSystemCacheRedisPassword']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheRedisPassword', 'required']) ?>
- 'systemSettingsSystemCacheRedisServer']) ?> + 'systemSettingsSystemCacheRedisServer']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheRedisServer', 'required']) ?>
- 'systemSettingsSystemCacheRedisPort']) ?> + 'systemSettingsSystemCacheRedisPort']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheRedisPort', 'required']) ?>
- 'systemSettingsSystemCacheSQLite3Database']) ?> + 'systemSettingsSystemCacheSQLite3Database']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheSQLite3Database', 'required']) ?>
- 'systemSettingsSystemCacheSQLite3Table']) ?> + 'systemSettingsSystemCacheSQLite3Table']) ?> 'form-control', 'id' => 'systemSettingsSystemCacheSQLite3Table', 'required']) ?>

-

+


- 'systemSettingsSystemAdminPanelTheme']) ?> - __('admin_system_settings_admin_panel_theme_light'), 'dark' => __('admin_system_settings_admin_panel_theme_dark')], $settings['admin_panel']['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemAdminPanelTheme', 'required']) ?> + 'systemSettingsSystemAdminPanelTheme']) ?> + __('admin_light'), 'dark' => __('admin_dark')], $settings['admin_panel']['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemAdminPanelTheme', 'required']) ?>
diff --git a/site/plugins/admin/views/templates/users/profile.php b/site/plugins/admin/views/templates/users/profile.php index 3af347b8..31cf7929 100644 --- a/site/plugins/admin/views/templates/users/profile.php +++ b/site/plugins/admin/views/templates/users/profile.php @@ -9,7 +9,7 @@ Themes::view('admin/views/partials/navbar') ->assign('links', [ 'information' => [ 'link' => Http::getBaseUrl() . '/admin/profile', - 'title' => __('admin_menu_profile'), + 'title' => __('admin_profile'), 'attributes' => ['class' => 'navbar-item active'] ], ]) @@ -22,7 +22,7 @@ Themes::view('admin/views/partials/content-start')->display(); :
:

- + display() ?> From bd03d8dc2c73f70062bc2fd02e090e125e89baef Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 17 Jan 2019 03:56:24 +0300 Subject: [PATCH 0005/1219] Update Crowdin configuration file --- crowdin.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000..de0f2560 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: /site/plugins/admin/languages/en.yaml + translation: /site/plugins/admin/languages/%locale% From 634cea3251ac4b96dcac639fc28fe806b87e8cbd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 17 Jan 2019 04:08:26 +0300 Subject: [PATCH 0006/1219] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index de0f2560..eaa4e54e 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - source: /site/plugins/admin/languages/en.yaml - translation: /site/plugins/admin/languages/%locale% + translation: /site/plugins/admin/languages/%locale%.yaml From fb244f028de441f32128d43f69010188866b17fd Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 17 Jan 2019 18:03:39 +0300 Subject: [PATCH 0007/1219] Admin Panel: Translates - REFACTORING. --- site/plugins/admin/admin.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index 5f55a9fa..ee498af7 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -46,19 +46,19 @@ if (Admin::isAdminArea()) { Event::addListener('onCurrentEntryBeforeLoaded', function () { // Add navigation links - NavigationManager::addItem('content', 'entries', '' . __('admin_menu_content_entries', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/entries', ['class' => 'nav-link']); - NavigationManager::addItem('extends', 'menus', '' . __('admin_menu_content_menus', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/menus', ['class' => 'nav-link']); - NavigationManager::addItem('extends', 'fieldsets', '' . __('admin_menu_extends_fieldsets', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/fieldsets', ['class' => 'nav-link']); - NavigationManager::addItem('extends', 'templates', '' . __('admin_menu_extends_templates', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/templates', ['class' => 'nav-link']); - NavigationManager::addItem('extends', 'snippets', '' . __('admin_menu_extends_snippets', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/snippets', ['class' => 'nav-link']); - NavigationManager::addItem('extends', 'plugins', '' . __('admin_menu_extends_plugins', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/plugins', ['class' => 'nav-link']); - NavigationManager::addItem('settings', 'settings', '' . __('admin_menu_system_settings', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/settings', ['class' => 'nav-link']); - NavigationManager::addItem('settings', 'infomation', '' . __('admin_menu_system_information', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/information', ['class' => 'nav-link']); + NavigationManager::addItem('content', 'entries', '' . __('admin_entries', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/entries', ['class' => 'nav-link']); + NavigationManager::addItem('extends', 'menus', '' . __('admin_menus', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/menus', ['class' => 'nav-link']); + NavigationManager::addItem('extends', 'fieldsets', '' . __('admin_fieldsets', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/fieldsets', ['class' => 'nav-link']); + NavigationManager::addItem('extends', 'templates', '' . __('admin_templates', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/templates', ['class' => 'nav-link']); + NavigationManager::addItem('extends', 'snippets', '' . __('admin_snippets', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/snippets', ['class' => 'nav-link']); + NavigationManager::addItem('extends', 'plugins', '' . __('admin_plugins', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/plugins', ['class' => 'nav-link']); + NavigationManager::addItem('settings', 'settings', '' . __('admin_settings', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/settings', ['class' => 'nav-link']); + NavigationManager::addItem('settings', 'infomation', '' . __('admin_information', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/information', ['class' => 'nav-link']); if (Registry::get('settings.locale') == 'ru') { - NavigationManager::addItem('help', 'documentation', '' . __('admin_menu_help_documentation', Registry::get('settings.locale')), 'http://flextype.ru/documentation/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); + NavigationManager::addItem('help', 'documentation', '' . __('admin_getting_help', Registry::get('settings.locale')), 'http://flextype.ru/documentation/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); } else { - NavigationManager::addItem('help', 'documentation', '' . __('admin_menu_help_documentation', Registry::get('settings.locale')), 'http://flextype.org/documentation/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); + NavigationManager::addItem('help', 'documentation', '' . __('admin_getting_help', Registry::get('settings.locale')), 'http://flextype.org/documentation/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); } // Initializes the Notification service. From df9f04086d49a7e999f42c042ba234bd43132d74 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 17 Jan 2019 18:04:11 +0300 Subject: [PATCH 0008/1219] Admin Panel: Translates - REFACTORING. --- site/plugins/admin/languages/cs.yaml | 76 ------- site/plugins/admin/languages/de.yaml | 304 +++++++++++++++------------ site/plugins/admin/languages/pt.yaml | 203 ------------------ site/plugins/admin/languages/uk.yaml | 143 ------------- 4 files changed, 174 insertions(+), 552 deletions(-) delete mode 100644 site/plugins/admin/languages/cs.yaml delete mode 100644 site/plugins/admin/languages/pt.yaml delete mode 100644 site/plugins/admin/languages/uk.yaml diff --git a/site/plugins/admin/languages/cs.yaml b/site/plugins/admin/languages/cs.yaml deleted file mode 100644 index 6435c21a..00000000 --- a/site/plugins/admin/languages/cs.yaml +++ /dev/null @@ -1,76 +0,0 @@ -admin: "Admin" -admin_title: "Název" -admin_description: "Popis" -admin_keywords: "Klíčová slova" -admin_username: "Uživatelské jméno" -admin_password: "Heslo" -admin_login: "Přihlášení" -admin_entries_delete: "Smazat" -admin_entries_heading: "Stránky" -admin_entries_name: "Jméno" -admin_entries_url: "Url" -admin_entries_create_new: "Vytvořit novou stránku" -admin_save: "Uložit" -admin_entries_entry: "Stránka" -admin_entries_title: "Nadpis" -admin_entries_parent_entry: "Rodičovská stránka" -admin_create: "Vytvořit" -admin_menu_entries: "Stránky" -admin_menu_content: "Obsah" -admin_menu_content_entries: "Stránky" -admin_menu_extends: "Rozšíření" -admin_menu_extends_plugins: "Zásuvné moduly" -admin_menu_extends_themes: "Témata vzhledu" -admin_menu_system: "Systém" -admin_menu_system_settings: "Nastavení" -admin_menu_system_information: "Informace" -admin_menu_help: "Nápověda" -admin_menu_help_documentation: "Dokumentace" -admin_menu_view_site: "Zobrazit web" -admin_menu_logout: "Odhlásit" -admin_entries_content: "Obsah stránek" -admin_entries_edit_entry: "Upravit stránku" -admin_cancel: "Zpět" -admin_entries_visibility: "Viditelnost" -admin_entries_description: "Popis" -admin_entries_template: "Šablona" -admin_entries_date: "Datum" -admin_email: "E-mail" -admin_users_create_new: "Vytvořit nového uživatele" -admin_users_create: "Vytvořit uživatele" -admin_entries_rename_entry: "Přejmenovat stránku" -admin_entries_rename: "Přejmenovat" -admin_entries_attributes: "Vlastnosti stránky" -admin_entries_publish: "Zveřejnit" -admin_entries_switch_to_expert_mode: "Přepnout do pokročilého modu" -admin_entries_switch_back_to_editor_mode: "Přepnout zpět do editorského módu" -admin_entries_files: "Soubory" -admin_entries_files_upload: "Nahrát" -admin_information_heading: "Informace" -admin_system_settings_heading: "Nastavení" -admin_system_settings_site: "Webové stránky" -admin_system_settings_system: "Systém" -admin_system_clear_cache: "Vyčistit cache" -admin_system_settings_site_title: "Název webu" -admin_system_settings_site_description: "Popis webu" -admin_system_settings_site_keywords: "Klíčová slova webu" -admin_system_settings_site_robots: "Robots" -admin_system_settings_site_author_name: "Jméno autora" -admin_system_settings_site_author_email: "E-mail autora" -admin_system_settings_system_timezone: "Časová zóna" -admin_system_settings_system_date_format: "Formát data" -admin_system_settings_system_charset: "Znaková sada" -admin_system_settings_system_theme: "Téma vzhledu" -admin_system_settings_system_locale: "Jazykové nastavení" -admin_system_settings_system_entries_main: "Hlavní stránka" -admin_system_settings_system_errors_display: "Zobrazovat chyby" -admin_system_settings_system_cache_enabled: "Používat cache" -admin_system_settings_system_cache_prefix: "Prefix cache" -admin_system_settings_system_cache_driver: "Driver pro cache" -admin_system_settings_system_cache_lifetime: "Životnost cache" -admin_entries_image_preview: "Náhled obrázku" -admin_plugins_heading: "Zásuvné moduly" -admin_plugins_status: "Stav" -admin_plugins_status_enabled: "povoleno" -admin_plugins_status_disabled: "zakázáno" -admin_plugins_name: "Název" diff --git a/site/plugins/admin/languages/de.yaml b/site/plugins/admin/languages/de.yaml index 7a4ecfba..89b8c8c3 100644 --- a/site/plugins/admin/languages/de.yaml +++ b/site/plugins/admin/languages/de.yaml @@ -1,143 +1,187 @@ -admin: Admin -admin_cache: Cache -admin_cancel: Abbrechen -admin_create: Erstellen -admin_debugging: Debugging -admin_description: Beschreibung -admin_email: E-Mail -admin_flextype_admin_version: Flextype Admin Version -admin_flextype_core_version: Flextype Core Version -admin_information_heading: Information -admin_installed: Installiert -admin_keywords: "Keywords" +admin: "Admin" +admin_cancel: "Abbrechen" +admin_create: "Erstellen" +admin_debugging: "Debuggen" +admin_email: "E-Mail" +admin_flextype_version: "Flextype Version" +admin_information: "Informationen" +admin_installed: "Installiert" +admin_keywords: "Schlagwörter" admin_login: "Login" -admin_menu_content: "Inhalt" -admin_menu_content_entries: "Seiten" -admin_menu_extends: "Erweiterungen" -admin_menu_extends_plugins: "Plugins" -admin_menu_extends_themes: "Themes" -admin_menu_help: "Hilfe" -admin_menu_help_documentation: "Dokumentation" -admin_menu_logout: "Ausloggen" -admin_menu_entries: "Seiten" -admin_menu_profile: "Profile" -admin_menu_system: "System" -admin_menu_system_information: "Information" -admin_menu_system_settings: "Einstellungen" -admin_menu_view_site: "Seite ansehen" -admin_message_cache_files_deleted: "Cache Dateien gelöscht" -admin_message_entry_changes_saved: "Einstellungen erfolgreich gespeichert" -admin_message_entry_cloned: "Seite dupliziert" -admin_message_entry_created: "Seite erstellt" -admin_message_entry_deleted: "Seite gelöscht" -admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" -admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" -admin_message_entry_moved: "Seite verschoben" -admin_message_entry_renamed: "Seite umbenannt" -admin_message_settings_saved: "Einstellungen gespeichert" -admin_message_wrong_username_password: "Falscher Benutzername oder Passwort" +admin_entries: "Einträge" +admin_extends: "Erweiterungen" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Hilfe" +admin_getting_help: "Dokumentation" +admin_logout: "Ausloggen" +admin_profile: "Profil" +admin_view_site: "Seite ansehen" +admin_snippets: "Schnipsel" admin_not_installed: "Nicht installiert" admin_off: "Aus" admin_on: "An" admin_add: "Hinzufügen" -admin_entries_attributes: "Seitenattribute" -admin_entries_fieldset_for_template: "Fieldset für Templates" -admin_clone: "Klonen" -admin_entries_content: "Inhalt" -admin_entries_create_new: "Neue Seite erstellen" -admin_entries_date: "Datum" -admin_entries_delete: "Löschen" -admin_entries_description: "Beschreibung" -admin_entries_draft: "Entwurf" -admin_entries_edit: "Bearbeiten" -admin_entries_edit_blocks: "Blöcke" -admin_entries_edit_media: "Mediendateien" -admin_entries_edit_entry: "Seite bearbeiten" -admin_entries_edit_settings: "Einstellungen" -admin_entries_edit_template: "Template" -admin_entries_edit_templates: "Templates" -admin_entries_editor: "Inhalt" -admin_entries_editor_fieldset: "Fieldset" -admin_entries_editor_source: "Quelle" -admin_entries_editor_template: "Template" -admin_entries_error_name_empty_input: "Name muss aus alphanumerischen Zeichen bestehen (3-12 Zeichen)" -admin_entries_error_title_empty_input: "Titel muss aus alphanumerischer Zeichen bestehen (3-12 Zeichen)" -admin_entries_files: "Dateien" -admin_entries_files_delete: "Löschen" -admin_entries_files_upload: "Hochladen" -admin_entries_heading: "Seiten" -admin_entries_hidden: "Versteckt" -admin_entries_image_preview: "Bildvorschau" -admin_entries_move: "Verschieben" -admin_entries_name: "Name" -admin_entries_entry: "Seite" -admin_entries_parent_entry: "Übergeordnete Seite" -admin_entries_preview: "Vorschau" -admin_entries_publish: "Veröffentlichen" -admin_entries_rename: "Umbenennen" -admin_entries_rename_entry: "Umbenennen" -admin_entries_save_entry: Seite speichern -admin_entries_settings: "Einstellungen" -admin_entries_switch_back_to_editor_mode: "In den Basismodus wechseln" -admin_entries_switch_to_expert_mode: "In den Expertenmodus wechseln" -admin_entries_template: "Template" -admin_entries_title: "Titel" -admin_entries_url: "Url" -admin_entries_view: "Ansehen" -admin_entries_visibility: "Sichtbarkeit" -admin_entries_visible: "Sichtbar" +admin_entry_attributes: "Eintragsattribute" +admin_fieldset_for_template: "Fieldset für Vorlage" +admin_content: "Inhalt" +admin_create_new_entry: "Neuen Eintrag erstellen" +admin_date: "Datum" +admin_draft: "Entwurf" +admin_edit: "Bearbeiten" +admin_menus: "Menüs" +admin_blocks: "Blöcke" +admin_media: "Medien" +admin_settings: "Einstellungen" +admin_templates: "Vorlagen" +admin_entry: "Eintrag" +admin_fieldset: "Fieldset" +admin_source: "Quelle" +admin_files: "Dateien" +admin_upload: "Hochladen" +admin_hidden: "Versteckt" +admin_image_preview: "Bildvorschau" +admin_move: "Verschieben" +admin_parent_entry: "Übergeordneter Eintrag" +admin_preview: "Vorschau" +admin_publish: "Veröffentlichen" +admin_rename: "Umbenennen" +admin_save_entry: "Eintrag speichern" +admin_template: "Vorlage" +admin_title: "Titel" +admin_url: "Url" +admin_view: "Ansehen" +admin_visibility: "Sichtbarkeit" +admin_visible: "Sichtbar" admin_password: "Passwort" -admin_php_built_on: "PHP compiliert auf" +admin_php_built_on: "Basiert auf PHP" admin_php_version: "PHP Version" -admin_plugins_author_email: "Autor E-mail" -admin_plugins_author_name: "Autor Name" -admin_plugins_author_url: "Autor URL" -admin_plugins_bugs: "Bekannte Fehler" -admin_plugins_description: "Beschreibung" -admin_plugins_get_more_plugins: "Mehr Plugins installieren" -admin_plugins_heading: "Plugins" -admin_plugins_homeentry: "Homeentry" -admin_plugins_info: "Info" -admin_plugins_license: "Lizenz" -admin_plugins_name: "Name" -admin_plugins_status: "Status" -admin_plugins_status_disabled: "Deaktiviert" -admin_plugins_status_enabled: "Aktiviert" -admin_plugins_version: "Version" +admin_author_url: "Autor Url" +admin_bugs: "Fehler" +admin_description: "Beschreibung" +admin_get_more_plugins: "Mehr Plugins finden" +admin_homepage: "Startseite" +admin_info: "Info" +admin_license: "Lizenz" +admin_status: "Status" +admin_disabled: "deaktiviert" +admin_enabled: "aktiviert" +admin_version: "Version" admin_role: "Rolle" admin_save: "Speichern" -admin_security_check_results: "Ergebnisse der Sicherheitschecks" -admin_security_check_results_debug: "Aufgrund der Art und Menge an Informationen, die eine Fehlermeldung Eindringlingen geben kann wenn DISPLAY ERRORS aktiviert ist, empfehlen wir dringend, DISPLAY ERRORS in Produktionssystemen zu deaktivieren." -admin_security_check_results_htaccess: "Die Flextype .htaccess Datei ist beschreibbar. Es wird empfohlen, alle Schreibberechtigungen zu entfernen.
Auf UNIX-Systemen geht dies mit dem folgenden Befehl: chmod a-w :path" -admin_security_check_results_index: "Die Flextype index.php Datei ist beschreibbar. Es wird empfohlen, alle Schreibberechtigungen zu entfernen.
Auf UNIX-Systemen geht dies mit dem folgenden Befehl: chmod a-w :path" +admin_security_check_results: "Ergebnisse der Sicherheitsprüfung" +admin_security_check_results_debug: "Aufgrund des Typs und der Menge an Informationen die das Anzeigen von Fehlern an böswillige Besucher ausgeben könnte empfehlen wir ausdrücklich auf Produktivinstallationen diese Option zu deaktivieren." +admin_security_check_results_htaccess: "Die Flextype .htaccess Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun." +admin_security_check_results_index: "Die Flextype index.php Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun." admin_server: "Server" -admin_settings: "Einstellungen" admin_site: "Seite" +admin_clear_cache: "Cache löschen" +admin_error404_title: "Fehler 404 Eintrag Titel" +admin_error404_description: "Fehler 404 Eintrag Beschreibung" +admin_error404_content: "Fehler 404 Eintrag Inhalt" +admin_error404_template: "Fehler 404 Eintrag Vorlage" +admin_heading: "Einstellungen" +admin_general: "Allgemein" +admin_error_404_page: "Fehler 404 Eintrag" +admin_cache: "Cache" +admin_author_email: "Autor E-Mail" +admin_author_name: "Autor Name" +admin_site_description: "Seitenbeschreibung" +admin_site_keywords: "Seitenschlagwörter" +admin_site_robots: "Robots" +admin_site_title: "Seitentitel" admin_system: "System" -admin_system_clear_cache: "Cache löschen" -admin_system_settings_heading: "Einstellungen" -admin_system_settings_site: "Seite" -admin_system_settings_site_author_email: "Autor E-Mail" -admin_system_settings_site_author_name: "Autor Name" -admin_system_settings_site_description: "Seitenbeschreibung" -admin_system_settings_site_keywords: "Seitenkeywords" -admin_system_settings_site_robots: "Robots" -admin_system_settings_site_title: "Seitentitel" -admin_system_settings_system: "System" -admin_system_settings_system_cache_driver: "Cache Treiber" -admin_system_settings_system_cache_enabled: "Cache aktivieren" -admin_system_settings_system_cache_lifetime: "Cache Lebensdauer" -admin_system_settings_system_cache_prefix: "Cache Prefix" -admin_system_settings_system_charset: "Zeichensatz" -admin_system_settings_system_date_format: "Datumsformat" -admin_system_settings_system_errors_display: "Fehler anzeigen" -admin_system_settings_system_locale: "Sprache" -admin_system_settings_system_entries_main: "Startseite" -admin_system_settings_system_theme: "Theme" -admin_system_settings_system_timezone: "Zeitzone" +admin_cache_driver: "Cachetreiber" +admin_cache_enabled: "Cache aktiviert" +admin_cache_lifetime: "Cache Lebenszeit" +admin_cache_prefix: "Cache Prefix" +admin_charset: "Zeichensatz" +admin_date_format: "Datumsformat" +admin_errors_display: "Fehler anzeigen" +admin_locale: "Sprache" +admin_entry_main: "Startseite" +admin_theme: "Theme" +admin_timezone: "Zeitzone" admin_username: "Benutzername" -admin_users_create: "Benutzer erstellen" -admin_users_create_new: "Neuen Benutzer anlegen" -admin_view_site: "Seite ansehen" -admin_web_server: "Web Server" -admin_web_server_php_interface: "Netzwerkprotokoll" \ No newline at end of file +admin_create_user: "Benutzer erstellen" +admin_create_new_user: "Neuen Benutzer anlegen" +admin_web_server: "Webserver" +admin_web_server_php_interface: "PHP-Schnittstelle" +admin_menu: "Menü" +admin_create_new_category: "Neue Kategorie anlegen" +admin_delete_category: "Kategorie löschen" +admin_create_new_item: "Neuen Eintrag erstellen" +admin_delete: "Löschen" +admin_order: "Reihenfolge" +admin_edit_category: "Kategorie bearbeiten" +admin_create_new_menu: "Neues Menü erstellen" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Neue Vorlage erstellen" +admin_create_new_fieldset: "Neues Fieldset erstellen" +admin_duplicate: "Duplizieren" +admin_summary: "Zusammenfassung" +admin_snippet: "Schnipsel" +admin_type: "Typ" +admin_partial: "Partial" +admin_clone: "Duplizieren" +admin_create_new_snippet: "Neuen Schnipsel erstellen" +admin_create_new_template: "Neue Vorlage erstellen" +admin_message_template_created: "Vorlage erstellt" +admin_message_template_deleted: "Vorlage gelöscht" +admin_message_template_renamed: "Vorlage umbenannt" +admin_message_template_duplicated: "Vorlage dupliziert" +admin_message_template_saved: "Vorlage gespeichert" +admin_message_snippet_saved: "Schnipsel gespeichert" +admin_message_snippet_created: "Schnipsel erstellt" +admin_message_snippet_deleted: "Schnipsel gelöscht" +admin_message_snippet_renamed: "Schnipsel umbenannt" +admin_message_snippet_duplicated: "Schnipsel dupliziert" +admin_message_menu_saved: "Menü gespeichert" +admin_message_menu_created: "Menü erstellt" +admin_message_menu_deleted: "Menü gelöscht" +admin_message_menu_renamed: "Menü umbenannt" +admin_message_menu_duplicated: "Menü dupliziert" +admin_message_fieldset_saved: "Fieldset gespeichert" +admin_message_fieldset_created: "Fieldset erstellt" +admin_message_fieldset_deleted: "Fieldset gelöscht" +admin_message_fieldset_renamed: "Fieldset umbenannt" +admin_message_fieldset_duplicated: "Fieldset dupliziert" +admin_message_entry_duplicated: "Eintrag dupliziert" +admin_message_cache_files_deleted: "Cache Dateien gelöscht" +admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" +admin_message_entry_cloned: "Eintrag dupliziert" +admin_message_entry_created: "Eintrag erstellt" +admin_message_entry_deleted: "Eintrag gelöscht" +admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" +admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" +admin_message_entry_file_not_uploaded: "Datei konnte nicht hochgeladen werden" +admin_message_entry_moved: "Eintrag verschoben" +admin_message_entry_renamed: "Eintrag umbenannt" +admin_message_settings_saved: "Einstellungen gespeichert" +admin_message_wrong_username_password: "Benutzername oder Passwort falsch" +admin_quality: "Qualität" +admin_width: "Breite" +admin_height: "Höhe" +admin_types: "Erlaubte Dateitypen" +admin_embeded_code: "Eingebetteter Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Datei auswählen" +admin_browse_files: "Durchsuchen" +admin_copy: "Kopieren" +admin_admin_panel: "Admin Panel" +admin_light: "Hell" +admin_dark: "Dunkel" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Passwort" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Datenbank" +admin_sqlite3_table: "SQLite3 Tabelle" +admin_error_name_empty_input: "Name muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" +admin_error_title_empty_input: "Titel muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" diff --git a/site/plugins/admin/languages/pt.yaml b/site/plugins/admin/languages/pt.yaml deleted file mode 100644 index 407e29d5..00000000 --- a/site/plugins/admin/languages/pt.yaml +++ /dev/null @@ -1,203 +0,0 @@ -admin: "Admin" -admin_cache: "Cache" -admin_cancel: "Cancelar" -admin_create: "Criar" -admin_debugging: "Depurando" -admin_description: "Descrição" -admin_email: "E-mail" -admin_flextype_admin_version: "Versão do Administrador do Flextype" -admin_flextype_core_version: "Versão principal do Flextype" -admin_information_heading: "Informação" -admin_installed: "Instalado" -admin_keywords: "Palavras-chave" -admin_login: "Login" -admin_menu_content_entries: "Entradas" -admin_menu_extends: "Estende" -admin_menu_extends_plugins: "Plugins" -admin_menu_extends_themes: "Temas" -admin_menu_help: "Ajuda" -admin_menu_help_documentation: "Obtendo ajuda" -admin_menu_logout: "Logout" -admin_menu_entries: "Entradas" -admin_menu_profile: "Perfil" -admin_menu_system: "Sistema" -admin_menu_system_information: "Informação" -admin_menu_system_settings: "Configurações" -admin_menu_view_site: "Visualizar site" -admin_menu_extends_snippets: "Snippets" -admin_message_cache_files_deleted: "Arquivos de cache excluídos" -admin_message_entry_changes_saved: "Alterações salvas com sucesso" -admin_message_entry_cloned: "Entrada clonada" -admin_message_entry_created: "Entrada criada" -admin_message_entry_deleted: "Entrada excluída" -admin_message_entry_file_deleted: "Arquivo excluído com sucesso" -admin_message_entry_file_uploaded: "Arquivo carregado com sucesso" -admin_message_entry_moved: "Entrada movida" -admin_message_entry_renamed: "Entrada renomeada" -admin_message_settings_saved: "Configurações salvas" -admin_message_wrong_username_password: "Nome de usuário ou senha incorretos" -admin_not_installed: "Não instalado" -admin_off: "off" -admin_on: "on" -admin_add: "Adicionar" -admin_entries_attributes: "Atributos de Entrada" -admin_entries_fieldset_for_template: "Fieldset para modelo" -admin_content: "Conteúdo" -admin_entries_create_new: "Criar nova entrada" -admin_date: "data" -admin_entries_delete: "Excluir" -admin_entries_description: "Descrição" -admin_entries_draft: "Rascunho" -admin_entries_edit: "Editar" -admin_menu_content_menus: "Menus" -admin_entries_edit_blocks: "Blocos" -admin_entries_edit_media: "Mídia" -admin_entries_edit_entry: "Editar entrada" -admin_entries_edit_settings: "Configurações" -admin_entries_edit_template: "Template" -admin_entries_edit_templates: "Templates" -admin_entries_editor: "Entrada" -admin_entries_editor_fieldset: "Fieldset" -admin_entries_editor_source: "Source" -admin_entries_editor_template: "Template" -admin_entries_error_name_empty_input: "Nome tem que ser um valor alfanumérico (3-12 caracteres)" -admin_entries_error_title_empty_input: "O título tem que ser um valor alfanumérico (3-12 caracteres)" -admin_entries_files: "Arquivos" -admin_entries_files_delete: "Excluir" -admin_entries_files_upload: "Upload" -admin_entries_heading: "Entradas" -admin_entries_hidden: "Oculto" -admin_entries_image_preview: "Visualização de imagem" -admin_move: "Mover" -admin_entries_name: "Nome" -admin_entries_entry: "Entrada" -admin_entries_parent_entry: "Pai de entrada" -admin_entries_preview: "Visualizar" -admin_entries_publish: "Publicar" -admin_entries_rename: "Renomear" -admin_entries_rename_entry: "Renomear" -admin_entries_save_entry: "Salvar entrada" -admin_entries_settings: "Configurações" -admin_entries_switch_back_to_editor_mode: "modo de edição" -admin_entries_switch_to_expert_mode: "modo especialista" -admin_entries_template: "Template" -admin_entries_title: "Título" -admin_entries_url: "Url" -admin_entries_view: "Visualizar" -admin_visibility: "Visibilidade" -admin_entries_visible: "Visível" -admin_password: "Password" -admin_php_built_on: "PHP construído em" -admin_php_version: "Versão do PHP" -admin_plugins_author_email: "E-mail do autor" -admin_plugins_author_name: "Nome do autor" -admin_plugins_author_url: "URL do autor" -admin_plugins_bugs: "Bugs" -admin_plugins_description: "Descrição" -admin_plugins_get_more_plugins: "Obtenha mais plug-ins" -admin_plugins_heading: "Plugins" -admin_plugins_homeentry: "Homeentry" -admin_plugins_info: "Info" -admin_plugins_license: "Licença" -admin_plugins_name: "Nome" -admin_plugins_status: "Status" -admin_plugins_status_disabled: "desativado" -admin_plugins_status_enabled: "ativado" -admin_plugins_version: "Version" -admin_role: "Papel" -admin_save: "Salvar" -admin_security_check_results: "Resultados da verificação de segurança" -admin_security_check_results_debug: "Devido ao tipo e quantidade de informação que um erro pode dar aos intrusos quando DISPLAY ERROR TRUE, nós aconselhamos fortemente configurar ERROS DE EXIBIÇÃO FALSOS nos sistemas de produção." -admin_security_check_results_htaccess: "O arquivo .htaccess do Flextype foi encontrado para ser gravável. Aconselhamos que você remova todas as permissões de gravação.
Você pode fazer isso em sistemas unix com: chmod a-w: caminho " -admin_security_check_results_index: "O arquivo index.php do Flextype foi encontrado para ser gravável. Aconselhamos que você remova todas as permissões de gravação.
Você pode fazer isso em sistemas unix com: chmod a-w: path " -admin_server: "Servidor" -admin_settings: "Configurações" -admin_site: "Site" -admin_system: "Sistema" -admin_system_clear_cache: "Limpar cache" -admin_system_settings_system_entries_error404_title: "Título da entrada Error404" -admin_system_settings_system_entries_error404_description: "Descrição da entrada Error404" -admin_system_settings_system_entries_error404_content: "Conteúdo da entrada Error404" -admin_system_settings_system_entries_error404_template: "Modelo de entrada Error404" -admin_system_settings_heading: "Configurações" -admin_system_settings_site: "Site" -admin_system_settings_site_author_email: "Email do autor" -admin_system_settings_site_author_name: "Nome do autor" -admin_system_settings_site_description: "Descrição do site" -admin_system_settings_site_keywords: "Palavras-chave do site" -admin_system_settings_site_robots: "Robôs" -admin_system_settings_site_title: "Título do site" -admin_system_settings_system: "Sistema" -admin_system_settings_system_cache_driver: "Driver de cache" -admin_system_settings_system_cache_enabled: "Cache ativado" -admin_system_settings_system_cache_lifetime: "Vida útil do cache" -admin_system_settings_system_cache_prefix: "Prefixo de cache" -admin_system_settings_system_charset: "Charset" -admin_system_settings_system_date_format: "Formato de data" -admin_system_settings_system_errors_display: "Exibir erros" -admin_system_settings_system_locale: "Idioma" -admin_system_settings_system_entries_main: "Página Principal" -admin_system_settings_system_theme: "Tema" -admin_system_settings_system_timezone: "Fuso horário" -admin_username: "Username" -admin_users_create: "Criar usuário" -admin_users_create_new: "Criar novo usuário" -admin_view_site: "Visualizar site" -admin_web_server: "Servidor da Web" -admin_web_server_php_interface: "WebServer para a interface do PHP" -admin_menus_heading: "Menus" -admin_menu: "Menu" -admin_menus: "Menu" -admin_menus_create_new_category: "Criar nova categoria" -admin_menus_delete_category: "Excluir categoria" -admin_menus_create_new_item: "Criar novo item" -admin_menus_name: "Name" -admin_menu_item_edit: "Editar" -admin_menu_item_delete: "Excluir" -admin_menus_url: "Url" -admin_menus_order: "Pedido" -admin_menus_edit_category: "Editar categoria" -admin_create_new_menu: "Criar novo menu" -admin_menu_extends_fieldsets: "Fieldsets" -admin_menu_extends_templates: "Templates" -admin_preview: "Visualizar" -admin_template: "Template" -admin_templates: "Templates" -admin_template_create_new: "Criar novo modelo" -admin_fieldset: "Fieldset" -admin_create_new_fieldset: "Criar novo Fieldset" -admin_name: "Nome" -admin_fieldsets: "Fieldsets" -admin_edit: "Editar" -admin_rename: "Renomear" -admin_duplicate: "Duplicado" -admin_delete: "Excluir" -admin_title: "Title" -admin_summary: "Resumo" -admin_snippet: "Snippet" -admin_snippets: "Snippets" -admin_type: "Type" -admin_partial: "parcial" -admin_clone: ​​"Clone" -admin_create_new_snippet: "Criar novo snippet" -admin_create_new_template: "Criar novo modelo" -admin_message_template_created: "Modelo criado" -admin_message_template_deleted: "Modelo excluído" -admin_message_template_renamed: "Template renomeado" -admin_message_template_duplicated: "Modelo duplicado" -admin_message_template_saved: "Template salvo" -admin_message_snippet_saved: "Snippet salvo" -admin_message_snippet_created: "Snippet created" -admin_message_snippet_deleted: "Snippet excluído" -admin_message_snippet_renamed: "Snippet renomeado" -admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu salvo" -admin_message_menu_created: "Menu criado" -admin_message_menu_deleted: "Menu excluído" -admin_message_menu_renamed: "Menu renomeado" -admin_message_menu_duplicated: "Menu duplicado" -admin_message_fieldset_saved: "Fieldset salvo" -admin_message_fieldset_created: "Fieldset criado" -admin_message_fieldset_deleted: "Fieldset excluído" -admin_message_fieldset_renamed: "Fieldset renomeado" -admin_message_fieldset_duplicated: "Fieldset duplicado" diff --git a/site/plugins/admin/languages/uk.yaml b/site/plugins/admin/languages/uk.yaml deleted file mode 100644 index c0c1ec0d..00000000 --- a/site/plugins/admin/languages/uk.yaml +++ /dev/null @@ -1,143 +0,0 @@ -admin: "Адмін" -admin_cache: "Кеш" -admin_cancel: "Скасувати" -admin_create: "Створити" -admin_debugging: "Отладка" -admin_description: "Опис" -admin_email: "Емейл" -admin_flextype_admin_version: "Flextype версія плагіна Адмін" -admin_flextype_core_version: "Flextype версія ядра" -admin_information_heading: "Информація" -admin_installed: "встановлений" -admin_keywords: "Ключові слова" -admin_login: "Логін" -admin_menu_content: "Контент" -admin_menu_content_entries: "Сторінки" -admin_menu_extends: "Розширення" -admin_menu_extends_plugins: "Плагіни" -admin_menu_extends_themes: "Теми" -admin_menu_help: "Допомога" -admin_menu_help_documentation: "Документація" -admin_menu_logout: "Вийти" -admin_menu_entries: "Сторінки" -admin_menu_profile: "Профіль" -admin_menu_system: "Система" -admin_menu_system_information: "Информація" -admin_menu_system_settings: "Налаштування системи" -admin_menu_view_site: "Сайт" -admin_message_cache_files_deleted: "Файли кеша видалені" -admin_message_entry_changes_saved: "Зміни успішно збережені" -admin_message_entry_cloned: "Копія цієї сторінки" -admin_message_entry_created: "Сторінка успішно створена" -admin_message_entry_deleted: "Сторінка видалена" -admin_message_entry_file_deleted: "Файл успішно видалений" -admin_message_entry_file_uploaded: "Файл успішно завантажений" -admin_message_entry_moved: "Сторінка переміщена" -admin_message_entry_renamed: "Сторінка перейменована" -admin_message_settings_saved: "Налаштування збережені" -admin_message_wrong_username_password: "Неправильне ім'я користувача або пароль" -admin_not_installed: "не встановлений" -admin_off: "вимкнути" -admin_on: "увімкнути" -admin_add: "Додати" -admin_entries_attributes: "Атрибути сторінки" -admin_entries_fieldset_for_template: "Схема шаблону" -admin_clone: "Клонировать" -admin_entries_content: "Контент" -admin_entries_create_new: "Створити нову сторінку" -admin_entries_date: "Дата" -admin_entries_delete: "Вилучити" -admin_entries_description: "Опис" -admin_entries_draft: "Чернетка" -admin_entries_edit: "Редагувати" -admin_entries_edit_blocks: "Блоки" -admin_entries_edit_media: "Медіа" -admin_entries_edit_entry: "Редагувати сторінку" -admin_entries_edit_settings: "Налаштування" -admin_entries_edit_template: "Шаблон" -admin_entries_edit_templates: "Шаблони" -admin_entries_editor: "Контент" -admin_entries_editor_fieldset: "Схема" -admin_entries_editor_source: "Код" -admin_entries_editor_template: "Шаблон" -admin_entries_error_name_empty_input: "Ім'я повинно бути буквено-цифровим значенням (від 3 до 12 символів)" -admin_entries_error_title_empty_input: "Назва повинна бути буквено-цифровим значенням (від 3 до 12 символів)" -admin_entries_files: "Файли" -admin_entries_files_delete: "Вилучити" -admin_entries_files_upload: "Завантажити" -admin_entries_heading: "Сторінки" -admin_entries_hidden: "Прихований" -admin_entries_image_preview: "Перегляд зображення" -admin_entries_move: "Перейти" -admin_entries_name: "Назва" -admin_entries_entry: "Сторінка" -admin_entries_parent_entry: "Батьківська сторінка" -admin_entries_preview: "Переглянути" -admin_entries_publish: "Опублікувати" -admin_entries_rename: "Перейменувати" -admin_entries_rename_entry: "Перейменувати" -admin_entries_save_entry: "Зберегти" -admin_entries_settings: "Налаштування" -admin_entries_switch_back_to_editor_mode: "Режим редактора" -admin_entries_switch_to_expert_mode: "Експертний режим" -admin_entries_template: "Шаблон" -admin_entries_title: "Заголовок" -admin_entries_url: "Посилання" -admin_entries_view: "Подивитися" -admin_entries_visibility: "Подивитися" -admin_entries_visible: "Відображаємий" -admin_password: "Пароль" -admin_php_built_on: "PHP вбудована" -admin_php_version: "PHP версія" -admin_plugins_author_email: "Емейл автора" -admin_plugins_author_name: "Ім'я автора" -admin_plugins_author_url: "URL автора" -admin_plugins_bugs: "Помилки" -admin_plugins_description: "Опис" -admin_plugins_get_more_plugins: "Завантажити плагіни" -admin_plugins_heading: "Плагіни" -admin_plugins_homeentry: "Домашня сторінка" -admin_plugins_info: "Інформація" -admin_plugins_license: "Ліцензія" -admin_plugins_name: "Назва" -admin_plugins_status: "Статус" -admin_plugins_status_disabled: "вимкнений" -admin_plugins_status_enabled: "включений" -admin_plugins_version: "Версія плагіна" -admin_role: "Роль" -admin_save: "Зберегти" -admin_security_check_results: "Результати перевірки безпеки" -admin_security_check_results_debug: "Система працює в режимі налагодження Ми рекомендуємо вам прибрати режим налагодження на живому сайті." -admin_security_check_results_htaccess: "Головний .htaccess доступний для запису. Ми рекомендуємо вам видалити права записи на головний .htaccess файл.
Ви можете зробити це на UNIX системах так: chmod -R a-w :path" -admin_security_check_results_index: "Головний index.php файл доступний для запису. Ми рекомендуємо вам видалити права записи на головний index.php файл.
Ви можете зробити це на UNIX системах так: chmod -R a-w :path" -admin_server: "Сервер" -admin_settings: "Налаштування" -admin_site: "Сайт" -admin_system: "Система" -admin_system_clear_cache: "Очистити кеш" -admin_system_settings_heading: "Налаштування" -admin_system_settings_site: "Сайт" -admin_system_settings_site_author_email: "Емейл автора" -admin_system_settings_site_author_name: "Ім'я автора" -admin_system_settings_site_description: "Опис сайту" -admin_system_settings_site_keywords: "Ключові слова сайту" -admin_system_settings_site_robots: "Роботи" -admin_system_settings_site_title: "Заголовок сайту" -admin_system_settings_system: "Система" -admin_system_settings_system_cache_driver: "Драйвер кешу" -admin_system_settings_system_cache_enabled: "Кеш включений" -admin_system_settings_system_cache_lifetime: "Час зберігання кешу" -admin_system_settings_system_cache_prefix: "Префікс кешу" -admin_system_settings_system_charset: "Кодування сторінки" -admin_system_settings_system_date_format: "Формат відображення дати" -admin_system_settings_system_errors_display: "Відображати помилки" -admin_system_settings_system_locale: "Мова" -admin_system_settings_system_entries_main: "Головна сторінка" -admin_system_settings_system_theme: "Тема" -admin_system_settings_system_timezone: "Часовий пояс" -admin_username: "Ім'я користувача" -admin_users_create: "Створити користувача" -admin_users_create_new: "Створити нового користувача" -admin_view_site: "Сайт" -admin_web_server: "Веб сервер" -admin_web_server_php_interface: "Веб Сервер PHP Інтерфейс" From 10b2f3194a8c4c525af9b5709e29844755e33a91 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 17 Jan 2019 19:37:42 +0300 Subject: [PATCH 0009/1219] Admin Panel: Translates - REFACTORING. --- site/plugins/admin/languages/de.yaml | 187 -------------------- site/plugins/admin/languages/hr.yaml | 144 ---------------- site/plugins/admin/languages/ru.yaml | 245 --------------------------- 3 files changed, 576 deletions(-) delete mode 100644 site/plugins/admin/languages/de.yaml delete mode 100644 site/plugins/admin/languages/hr.yaml delete mode 100755 site/plugins/admin/languages/ru.yaml diff --git a/site/plugins/admin/languages/de.yaml b/site/plugins/admin/languages/de.yaml deleted file mode 100644 index 89b8c8c3..00000000 --- a/site/plugins/admin/languages/de.yaml +++ /dev/null @@ -1,187 +0,0 @@ -admin: "Admin" -admin_cancel: "Abbrechen" -admin_create: "Erstellen" -admin_debugging: "Debuggen" -admin_email: "E-Mail" -admin_flextype_version: "Flextype Version" -admin_information: "Informationen" -admin_installed: "Installiert" -admin_keywords: "Schlagwörter" -admin_login: "Login" -admin_entries: "Einträge" -admin_extends: "Erweiterungen" -admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Hilfe" -admin_getting_help: "Dokumentation" -admin_logout: "Ausloggen" -admin_profile: "Profil" -admin_view_site: "Seite ansehen" -admin_snippets: "Schnipsel" -admin_not_installed: "Nicht installiert" -admin_off: "Aus" -admin_on: "An" -admin_add: "Hinzufügen" -admin_entry_attributes: "Eintragsattribute" -admin_fieldset_for_template: "Fieldset für Vorlage" -admin_content: "Inhalt" -admin_create_new_entry: "Neuen Eintrag erstellen" -admin_date: "Datum" -admin_draft: "Entwurf" -admin_edit: "Bearbeiten" -admin_menus: "Menüs" -admin_blocks: "Blöcke" -admin_media: "Medien" -admin_settings: "Einstellungen" -admin_templates: "Vorlagen" -admin_entry: "Eintrag" -admin_fieldset: "Fieldset" -admin_source: "Quelle" -admin_files: "Dateien" -admin_upload: "Hochladen" -admin_hidden: "Versteckt" -admin_image_preview: "Bildvorschau" -admin_move: "Verschieben" -admin_parent_entry: "Übergeordneter Eintrag" -admin_preview: "Vorschau" -admin_publish: "Veröffentlichen" -admin_rename: "Umbenennen" -admin_save_entry: "Eintrag speichern" -admin_template: "Vorlage" -admin_title: "Titel" -admin_url: "Url" -admin_view: "Ansehen" -admin_visibility: "Sichtbarkeit" -admin_visible: "Sichtbar" -admin_password: "Passwort" -admin_php_built_on: "Basiert auf PHP" -admin_php_version: "PHP Version" -admin_author_url: "Autor Url" -admin_bugs: "Fehler" -admin_description: "Beschreibung" -admin_get_more_plugins: "Mehr Plugins finden" -admin_homepage: "Startseite" -admin_info: "Info" -admin_license: "Lizenz" -admin_status: "Status" -admin_disabled: "deaktiviert" -admin_enabled: "aktiviert" -admin_version: "Version" -admin_role: "Rolle" -admin_save: "Speichern" -admin_security_check_results: "Ergebnisse der Sicherheitsprüfung" -admin_security_check_results_debug: "Aufgrund des Typs und der Menge an Informationen die das Anzeigen von Fehlern an böswillige Besucher ausgeben könnte empfehlen wir ausdrücklich auf Produktivinstallationen diese Option zu deaktivieren." -admin_security_check_results_htaccess: "Die Flextype .htaccess Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun." -admin_security_check_results_index: "Die Flextype index.php Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun." -admin_server: "Server" -admin_site: "Seite" -admin_clear_cache: "Cache löschen" -admin_error404_title: "Fehler 404 Eintrag Titel" -admin_error404_description: "Fehler 404 Eintrag Beschreibung" -admin_error404_content: "Fehler 404 Eintrag Inhalt" -admin_error404_template: "Fehler 404 Eintrag Vorlage" -admin_heading: "Einstellungen" -admin_general: "Allgemein" -admin_error_404_page: "Fehler 404 Eintrag" -admin_cache: "Cache" -admin_author_email: "Autor E-Mail" -admin_author_name: "Autor Name" -admin_site_description: "Seitenbeschreibung" -admin_site_keywords: "Seitenschlagwörter" -admin_site_robots: "Robots" -admin_site_title: "Seitentitel" -admin_system: "System" -admin_cache_driver: "Cachetreiber" -admin_cache_enabled: "Cache aktiviert" -admin_cache_lifetime: "Cache Lebenszeit" -admin_cache_prefix: "Cache Prefix" -admin_charset: "Zeichensatz" -admin_date_format: "Datumsformat" -admin_errors_display: "Fehler anzeigen" -admin_locale: "Sprache" -admin_entry_main: "Startseite" -admin_theme: "Theme" -admin_timezone: "Zeitzone" -admin_username: "Benutzername" -admin_create_user: "Benutzer erstellen" -admin_create_new_user: "Neuen Benutzer anlegen" -admin_web_server: "Webserver" -admin_web_server_php_interface: "PHP-Schnittstelle" -admin_menu: "Menü" -admin_create_new_category: "Neue Kategorie anlegen" -admin_delete_category: "Kategorie löschen" -admin_create_new_item: "Neuen Eintrag erstellen" -admin_delete: "Löschen" -admin_order: "Reihenfolge" -admin_edit_category: "Kategorie bearbeiten" -admin_create_new_menu: "Neues Menü erstellen" -admin_fieldsets: "Fieldsets" -admin_template_create_new: "Neue Vorlage erstellen" -admin_create_new_fieldset: "Neues Fieldset erstellen" -admin_duplicate: "Duplizieren" -admin_summary: "Zusammenfassung" -admin_snippet: "Schnipsel" -admin_type: "Typ" -admin_partial: "Partial" -admin_clone: "Duplizieren" -admin_create_new_snippet: "Neuen Schnipsel erstellen" -admin_create_new_template: "Neue Vorlage erstellen" -admin_message_template_created: "Vorlage erstellt" -admin_message_template_deleted: "Vorlage gelöscht" -admin_message_template_renamed: "Vorlage umbenannt" -admin_message_template_duplicated: "Vorlage dupliziert" -admin_message_template_saved: "Vorlage gespeichert" -admin_message_snippet_saved: "Schnipsel gespeichert" -admin_message_snippet_created: "Schnipsel erstellt" -admin_message_snippet_deleted: "Schnipsel gelöscht" -admin_message_snippet_renamed: "Schnipsel umbenannt" -admin_message_snippet_duplicated: "Schnipsel dupliziert" -admin_message_menu_saved: "Menü gespeichert" -admin_message_menu_created: "Menü erstellt" -admin_message_menu_deleted: "Menü gelöscht" -admin_message_menu_renamed: "Menü umbenannt" -admin_message_menu_duplicated: "Menü dupliziert" -admin_message_fieldset_saved: "Fieldset gespeichert" -admin_message_fieldset_created: "Fieldset erstellt" -admin_message_fieldset_deleted: "Fieldset gelöscht" -admin_message_fieldset_renamed: "Fieldset umbenannt" -admin_message_fieldset_duplicated: "Fieldset dupliziert" -admin_message_entry_duplicated: "Eintrag dupliziert" -admin_message_cache_files_deleted: "Cache Dateien gelöscht" -admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" -admin_message_entry_cloned: "Eintrag dupliziert" -admin_message_entry_created: "Eintrag erstellt" -admin_message_entry_deleted: "Eintrag gelöscht" -admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" -admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" -admin_message_entry_file_not_uploaded: "Datei konnte nicht hochgeladen werden" -admin_message_entry_moved: "Eintrag verschoben" -admin_message_entry_renamed: "Eintrag umbenannt" -admin_message_settings_saved: "Einstellungen gespeichert" -admin_message_wrong_username_password: "Benutzername oder Passwort falsch" -admin_quality: "Qualität" -admin_width: "Breite" -admin_height: "Höhe" -admin_types: "Erlaubte Dateitypen" -admin_embeded_code: "Eingebetteter Code" -admin_shortcode: "Shortcode" -admin_php_code: "PHP Code" -admin_choose_files_to_upload: "Datei auswählen" -admin_browse_files: "Durchsuchen" -admin_copy: "Kopieren" -admin_admin_panel: "Admin Panel" -admin_light: "Hell" -admin_dark: "Dunkel" -admin_name: "Name" -admin_memcache_server: "Memcache Server" -admin_memcache_port: "Memcache Port" -admin_memcached_server: "Memcached Server" -admin_memcached_port: "Memcached Port" -admin_redis_socket: "Redis Socket" -admin_redis_password: "Redis Passwort" -admin_redis_server: "Redis Server" -admin_redis_port: "Redis Port" -admin_sqlite3_database: "SQLite3 Datenbank" -admin_sqlite3_table: "SQLite3 Tabelle" -admin_error_name_empty_input: "Name muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" -admin_error_title_empty_input: "Titel muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" diff --git a/site/plugins/admin/languages/hr.yaml b/site/plugins/admin/languages/hr.yaml deleted file mode 100644 index 11f99f8f..00000000 --- a/site/plugins/admin/languages/hr.yaml +++ /dev/null @@ -1,144 +0,0 @@ -admin: "Admin" -admin_cache: "Cache" -admin_cancel: "Otkaži" -admin_create: "Stvori" -admin_debugging: "Uklanjanje bugova" -admin_description: "Opis" -admin_email: "Email" -admin_flextype_admin_version: "Flextype Admin Verzija" -admin_flextype_core_version: "Flextype Core Verzija" -admin_information_heading: "Informacije" -admin_installed: "Instaliran" -admin_keywords: "Ključne riječi" -admin_login: "Prijava" -admin_menu_content: "Sadržaj" -admin_menu_content_entries: "Stranice" -admin_menu_extends: "Proširuje" -admin_menu_extends_plugins: "Dodaci" -admin_menu_extends_themes: "Teme" -admin_menu_help: "Pomoć" -admin_menu_help_documentation: "Get Help" -admin_menu_logout: "Odjava" -admin_menu_entries: "Stranice" -admin_menu_profile: "Profil" -admin_menu_system: "Sustav" -admin_menu_system_information: "Informacije" -admin_menu_system_settings: "Postavke" -admin_menu_view_site: "Pogledaj web stranicu" -admin_message_cache_files_deleted: "Cache datoteke obrisane" -admin_message_entry_changes_saved: "Promjene su uspješno sačuvane" -admin_message_entry_cloned: "Stranica je klonirana" -admin_message_entry_created: "Stranica je stvorena" -admin_message_entry_deleted: "Stranica je obrisana" -admin_message_entry_file_deleted: "Datoteka je uspješno obrisana" -admin_message_entry_file_uploaded: "Datoteka je uspješno uploadana" -admin_message_entry_moved: "Stranica je maknuta" -admin_message_entry_renamed: "Stranici je promijenjeno ime" -admin_message_settings_saved: "Postavke su sačuvane" -admin_message_wrong_username_password: "Pogrešno korisničko ime ili lozinka" -admin_not_installed: "Nije instaliran" -admin_off: "isključeno" -admin_on: "uključeno" -admin_add: "Dodaj" -admin_entries_attributes: "Atributi stranice" -admin_entries_fieldset_for_template: "Fieldset za predložak" -admin_clone: "Kloniraj" -admin_entries_content: "Sadržaj" -admin_entries_create_new: "Stvori novu stranicu" -admin_entries_date: "Datum" -admin_entries_delete: "Obriši" -admin_entries_description: "Opis" -admin_entries_draft: "Skica" -admin_entries_edit: "Uredi" -admin_entries_edit_blocks: "Blokovi" -admin_entries_edit_media: "Media" -admin_entries_edit_entry: "Uredi stranicu" -admin_entries_edit_settings: "Postavke" -admin_entries_edit_template: "Predložak" -admin_entries_edit_templates: "Predlošci" -admin_entries_editor: "Sadržaj" -admin_entries_editor_fieldset: "Fieldset" -admin_entries_editor_source: "Izvor" -admin_entries_editor_template: "Predložak" -admin_entries_error_name_empty_input: "Ime mora biti alfanumerička vrijednost (3-12 chars)" -admin_entries_error_title_empty_input: "Naslov mora biti alfanumerička vrijednost (3-12 chars)" -admin_entries_files: "Datoteke" -admin_entries_files_delete: "Obriši" -admin_entries_files_upload: "Upload" -admin_entries_heading: "Stranice" -admin_entries_hidden: "Skriven" -admin_entries_image_preview: "Image preview" -admin_entries_move: "Makni" -admin_entries_name: "Ime" -admin_entries_entry: "Stranica" -admin_entries_parent_entry: "Roditeljska stranica" -admin_entries_preview: "Pregledaj" -admin_entries_publish: "Objavi" -admin_entries_rename: "Preimenuj" -admin_entries_rename_entry: "Preimenuj" -admin_entries_save_entry: "Sačuvaj stranicu" -admin_entries_settings: "Postavke" -admin_entries_switch_back_to_editor_mode: "Mod uređivanja" -admin_entries_switch_to_expert_mode: "Stručni mod" -admin_entries_template: "Predložak" -admin_entries_title: "Naslov" -admin_entries_url: "Link" -admin_entries_view: "Pregled" -admin_entries_visibility: "Vidljivost" -admin_entries_visible: "Vidljivo" -admin_password: "Lozinka" -admin_php_built_on: "PHP Built On" -admin_php_version: "PHP Verzija" -admin_plugins_author_email: "Autorov email" -admin_plugins_author_name: "Autorovo ime" -admin_plugins_author_url: "Autorov link" -admin_plugins_bugs: "Bugovi" -admin_plugins_description: "Opis" -admin_plugins_get_more_plugins: "Nabavi više dodataka" -admin_plugins_heading: "Dodaci" -admin_plugins_homeentry: "Homeentry" -admin_plugins_info: "Info" -admin_plugins_license: "Licenca" -admin_plugins_name: "Ime" -admin_plugins_status: "Status" -admin_plugins_status_disabled: "onemogućen" -admin_plugins_status_enabled: "omogućen" -admin_plugins_version: "Verzija" -admin_role: "Uloga" -admin_save: "Sačuvaj" -admin_security_check_results: "Rezultati provjere sigurnosti" -admin_security_check_results_debug: "Zbog vrste i količine informacija koje bi greška mogla dati uljezima kada je postavljeno DISPLAY ERRORS TRUE, preporučeno je postavljanje DISPLAY ERRORS FALSE u produkciji." -admin_security_check_results_htaccess: "U Flextype .htaccess datoteku je moguće zapisivati. Savjetujemo vam da maknete sva dopuštenja za zapisivanje.
Na unix sustavima ovo možete učiniti sa naredbom: chmod a-w :path" -admin_security_check_results_index: "U Flextype index.php datoteku je moguće zapisivati. Savjetujemo vam da maknete sva dopuštenja za zapisivanje.
Na unix sustavima ovo možete učiniti sa naredbom: chmod a-w :path" -admin_server: "Server" -admin_settings: "Postavke" -admin_site: "Sajt" -admin_system: "Sustav" -admin_system_clear_cache: "Očisti cache" -admin_system_settings_heading: "Postavke" -admin_system_settings_site: "Sajt" -admin_system_settings_site_author_email: "Autorov email" -admin_system_settings_site_author_name: "Autorovo name" -admin_system_settings_site_description: "Opis sajta" -admin_system_settings_site_keywords: "Ključne riječi sajta [SEO]" -admin_system_settings_site_robots: "Roboti" -admin_system_settings_site_title: "Ime sajta" -admin_system_settings_system: "Sustav" -admin_system_settings_system_cache_driver: "Cache driver" -admin_system_settings_system_cache_enabled: "Cache je omogućen" -admin_system_settings_system_cache_lifetime: "Životni vijek cachea " -admin_system_settings_system_cache_prefix: "Cache prefix" -admin_system_settings_system_charset: "Charset" -admin_system_settings_system_date_format: "Format datuma" -admin_system_settings_system_errors_display: "Prikaži greške" -admin_system_settings_system_locale: "Jezik" -admin_system_settings_system_entries_main: "Glavna stranica" -admin_system_settings_system_theme: "Tema" -admin_system_settings_system_timezone: "Vremenska zona" -admin_title: "Naslov" -admin_username: "Korisničko ime" -admin_users_create: "Stvori korisnika" -admin_users_create_new: "Stvori novog korisnika" -admin_view_site: "Vidi sajt" -admin_web_server: "Web Server" -admin_web_server_php_interface: "WebServer PHP Sučelja" diff --git a/site/plugins/admin/languages/ru.yaml b/site/plugins/admin/languages/ru.yaml deleted file mode 100755 index a9a5402c..00000000 --- a/site/plugins/admin/languages/ru.yaml +++ /dev/null @@ -1,245 +0,0 @@ -admin: "Админ" -admin_add: "Добавить" -admin_cache: "Кеш" -admin_cancel: "Отмена" -admin_clone: "Клонировать" -admin_content: "Контент" -admin_create: "Создать" -admin_create_new_fieldset: "Создать новый набор полей" -admin_create_new_menu: "Создать новое меню" -admin_create_new_snippet: "Создать новый сниппет" -admin_create_new_template: "Создать новый шаблон" -admin_date: "Дата" -admin_debugging: "Отладка" -admin_delete: "Удалить" -admin_description: "Описание" -admin_duplicate: "Дублировать" -admin_edit: "Редактировать" -admin_email: "Электронная почта" -admin_entries_attributes: "Атрибуты записи" -admin_entries_create_new: "Создать новую запись" -admin_entries_delete: "Удалить" -admin_entries_description: "Описание" -admin_entries_draft: "Черновик" -admin_entries_edit: "Редактировать" -admin_entries_edit_blocks: "Блоки" -admin_entries_edit_entry: "Редактировать запись" -admin_entries_edit_media: "Медиа" -admin_entries_edit_settings: "Настройки" -admin_entries_edit_template: "Шаблон" -admin_entries_edit_templates: "Шаблоны" -admin_entries_editor: "Контент" -admin_entries_editor_fieldset: "Схема" -admin_entries_editor_source: "Код" -admin_entries_editor_template: "Шаблон" -admin_entries_entry: "Запись" -admin_entries_move: "Перенести" -admin_entries_error_name_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)" -admin_entries_error_title_empty_input: "Заголовок должно быть буквенно-цифровым значением (от 1-го символа)" -admin_entries_fieldset_for_template: "Схема шаблона" -admin_entries_files: "Файлы" -admin_entries_files_delete: "Удалить" -admin_entries_files_upload: "Загрузить файл" -admin_entries_heading: "Записи" -admin_entries_hidden: "Скрытый" -admin_entries_image_preview: "Просмотр изображения" -admin_entries_name: "Название" -admin_entries_parent_entry: "Родительская страница" -admin_entries_preview: "Просмотр" -admin_entries_publish: "Публиковать" -admin_entries_rename: "Переименовать" -admin_entries_rename_entry: "Переименовать" -admin_entries_save_entry: "Сохранить" -admin_entries_settings: "Настройки" -admin_entries_switch_back_to_editor_mode: "Режим редактора" -admin_entries_switch_to_expert_mode: "Экспертный режим" -admin_entries_template: "Шаблон" -admin_entries_title: "Заголовок" -admin_entries_url: "Ссылка" -admin_entries_view: "Посмотреть" -admin_entries_visible: "Видимый" -admin_fieldset: "Поля" -admin_fieldsets: "Наборы полей" -admin_flextype_version: "Версия Flextype" -admin_information_heading: "Информация" -admin_installed: "установлен" -admin_keywords: "Ключевые слова" -admin_login: "Логин" -admin_menu: "Меню" -admin_menu_content_entries: "Записи" -admin_menu_content_menus: "Меню" -admin_menu_entries: "Записи" -admin_menu_extends: "Расширения" -admin_menu_extends_fieldsets: "Наборы полей" -admin_menu_extends_plugins: "Плагины" -admin_menu_extends_snippets: "Сниппеты" -admin_menu_extends_templates: "Шаблоны" -admin_menu_extends_themes: "Темы" -admin_menu_help: "Помощь" -admin_menu_help_documentation: "Документация" -admin_menu_item_delete: "Удалить" -admin_menu_item_edit: "Редактировать" -admin_menu_logout: "Выйти из системы" -admin_menu_profile: "Профиль пользователя" -admin_menu_system: "Система" -admin_menu_system_information: "Информация" -admin_menu_system_settings: "Настройки" -admin_menu_view_site: "Просмотр сайта" -admin_menus: "Меню" -admin_menus_create_new_category: "Создать новую категорию" -admin_menus_create_new_item: "Создать новый элемент в меню" -admin_menus_delete_category: "Удалить категорию" -admin_menus_edit_category: "Редактировать категорию" -admin_menus_heading: "Список меню" -admin_menus_name: "Название" -admin_menus_order: "Порядок" -admin_menus_url: "Url" -admin_message_cache_files_deleted: "Файлы кеша удалены" -admin_message_entry_changes_saved: "Успешно - Сохранены изменения" -admin_message_entry_cloned: "Копия этой страницы" -admin_message_entry_created: "Успешно - Создана новая страница" -admin_message_entry_deleted: "Удалена страница из списка" -admin_message_entry_file_deleted: "Файл удален из списка" -admin_message_entry_file_uploaded: "Успешно - загружен новый файл" -admin_message_entry_file_not_uploaded: "Файл не был загружен" -admin_message_entry_duplicated: "Успешно - Создан дубликат записи" -admin_message_entry_moved: "Запись перемещена" -admin_message_entry_renamed: "Запись переименована" -admin_message_fieldset_created: "Создать новое поле" -admin_message_fieldset_deleted: "Удалено поле из списка" -admin_message_fieldset_duplicated: "Успешно - Создан дубликат поля" -admin_message_fieldset_renamed: "Успешно - Переименовано поле" -admin_message_fieldset_saved: "Успешно - Сохранён набор полей" -admin_message_menu_created: "Успешно - Добавлено новое меню" -admin_message_menu_deleted: "Удалено меню из списка" -admin_message_menu_duplicated: "Успешно - Создан дубликат меню" -admin_message_menu_renamed: "Успешно - Переименовано меню" -admin_message_menu_saved: "Успешно - Сохранено меню" -admin_message_settings_saved: "Успешно - Сохранены настройки" -admin_message_snippet_created: "Успешно - создан новый сниппет" -admin_message_snippet_deleted: "Удален сниппет из списка" -admin_message_snippet_duplicated: "Успешно - Создан дубликат сниппета" -admin_message_snippet_renamed: "Успешно - Переименован сниппет" -admin_message_snippet_saved: "Успешно - Сохранён сниппет" -admin_message_template_created: "Успешно - Создан новый шаблон" -admin_message_template_deleted: "Удалён шаблон из списка" -admin_message_template_duplicated: "Успешно - Создан дубликат шаблона" -admin_message_template_renamed: "Переименовать шаблон" -admin_message_template_saved: "Сохранить шаблон" -admin_message_wrong_username_password: "Неверное имя пользователя или пароль" -admin_move: "Перенести" -admin_name: "Название" -admin_not_installed: "не установлен" -admin_off: "Отключен" -admin_on: "Включён" -admin_partial: "Частичное" -admin_password: "Пароль" -admin_php_built_on: "PHP встроенный" -admin_php_version: "PHP версия" -admin_plugins_author_email: "Емейл автора" -admin_plugins_author_name: "Имя автора" -admin_plugins_author_url: "URL автора" -admin_plugins_bugs: "Ошибки" -admin_plugins_description: "Описание" -admin_plugins_get_more_plugins: "Добавить новый плагин" -admin_plugins_heading: "Список плагинов" -admin_plugins_homepage: "Домашняя страница" -admin_plugins_info: "Информация о плагине" -admin_plugins_license: "Лицензия" -admin_plugins_name: "Название" -admin_plugins_status: "Статус" -admin_plugins_status_disabled: "выключен" -admin_plugins_status_enabled: "включен" -admin_plugins_version: "Версия плагина" -admin_preview: "Просмотр" -admin_rename: "Переименовать" -admin_role: "Роль пользователя" -admin_save: "Сохранить" -admin_security_check_results: "Результаты проверки безопасности" -admin_security_check_results_debug: "Система работает в режиме ОТЛАДКИ Мы рекомендуем вам УБРАТЬ режим ОТЛАДКИ на живом сайте." -admin_security_check_results_htaccess: "Главный .htaccess доступен для записи. Мы рекомендуем вам удалить права записи на главный .htaccess файл.
Вы можете сделать это на UNIX системах так: chmod -R a-w :path" -admin_security_check_results_index: "Главный index.php файл доступен для записи. Мы рекомендуем вам удалить права записи на главный index.php файл.
Вы можете сделать это на UNIX системах так: chmod -R a-w :path" -admin_server: "Сервер" -admin_settings: "Настройки" -admin_site: "Сайт" -admin_snippet: "Сниппет" -admin_snippets: "Список сниппетов" -admin_summary: "Краткое изложение" -admin_system: "Система" -admin_system_clear_cache: "Очистить кеш" -admin_system_settings_heading: "Настройки" -admin_system_settings_site: "Сайт" -admin_system_settings_general: "Основные" -admin_system_settings_error_404_page: "Страница ошибки 404" -admin_system_settings_debuggig: "Дебаггинг" -admin_system_settings_cache: "Кеш" -admin_system_settings_site_author_email: "Емейл автора" -admin_system_settings_site_author_name: "Имя автора" -admin_system_settings_site_description: "Краткое описание сайта" -admin_system_settings_site_keywords: "Ключевые слова используемые на сайте" -admin_system_settings_site_robots: "Информация для индексации поисковыми роботами" -admin_system_settings_site_title: "Заголовок сайта" -admin_system_settings_system: "Система" -admin_system_settings_system_cache_driver: "Драйвер кеша" -admin_system_settings_system_cache_enabled: "Сохранение кеша" -admin_system_settings_system_cache_lifetime: "Время хранения кеша (в секундах)" -admin_system_settings_system_cache_prefix: "Префикс кеша" -admin_system_settings_system_charset: "Кодировка системы" -admin_system_settings_system_date_format: "Формат отображения даты" -admin_system_settings_system_entries_error404_content: "Контент страницы Error 404" -admin_system_settings_system_entries_error404_description: "Описание страницы Error 404" -admin_system_settings_system_entries_error404_template: "Шаблон страницы Error 404" -admin_system_settings_system_entries_error404_title: "Заголовок страницы Error 404" -admin_system_settings_system_entries_main: "Главная страница сайта" -admin_system_settings_system_errors_display: "Отображение ошибок" -admin_system_settings_system_locale: "Язык" -admin_system_settings_system_theme: "Тема" -admin_system_settings_system_timezone: "Временная зона" -admin_template: "Шаблон" -admin_template_create_new: "Добавить новый шаблон" -admin_templates: "Список шаблонов" -admin_title: "Заголовок" -admin_type: "Тип" -admin_username: "Имя пользователя" -admin_users_create: "Создать пользователя" -admin_users_create_new: "Создать нового пользователя" -admin_view_site: "Сайт" -admin_visibility: "Видимость на сайте" -admin_web_server: "Веб сервер" -admin_web_server_php_interface: "Вебсервер PHP Интерефейс" -admin_menus_error_name_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)" -admin_menus_error_title_empty_input: "Заголовок должно быть буквенно-цифровым значением (от 1-го символа)" -admin_fieldsets_error_name_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)" -admin_fieldsets_error_title_empty_input: "Заголовок должно быть буквенно-цифровым значением (от 1-го символа)" -admin_templates_error_name_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)" -admin_snippets_error_name_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)" -admin_system_settings_system_cache_enabled_false: "Выключен" -admin_system_settings_system_cache_enabled_true: "Включен" -admin_system_settings_system_errors_enabled_false: "Выключено" -admin_system_settings_system_errors_enabled_true: "Включено" -admin_system_settings_media: "Медиа" -admin_system_settings_system_upload_images_quality: "Качество (0 - 100)" -admin_system_settings_system_upload_images_width: "Ширина" -admin_system_settings_system_upload_images_height: "Высота" -admin_system_settings_system_upload_accept_file_types: "Допустимые типы файлов для загрузки" -admin_embeded_code: "Код для вставки" -admin_shortcode: "Шорткод" -admin_php_code: "PHP код" -admin_entries_choose_files_to_upload: "Выбрать файл" -admin_entries_browse_files: "Выбрать файл" -admin_copy: "Копировать" -admin_system_settings_admin_panel: "Панель администратора" -admin_system_settings_admin_panel_theme: "Тема" -admin_system_settings_admin_panel_theme_light: "Светлая" -admin_system_settings_admin_panel_theme_dark: "Темная" -admin_menu_name: "Название" -admin_system_settings_cache_memcache_server: "Memcache Cервер" -admin_system_settings_cache_memcache_port: "Memcache Порт" -admin_system_settings_cache_memcached_server: "Memcached Cервер" -admin_system_settings_cache_memcached_port: "Memcached Порт" -admin_system_settings_cache_redis_socket: "Redis Сокет" -admin_system_settings_cache_redis_password: "Redis Пароль" -admin_system_settings_cache_redis_server: "Redis Cервер" -admin_system_settings_cache_redis_port: "Redis Порт" -admin_system_settings_cache_sqlite3_database: "SQLite3 База" -admin_system_settings_cache_sqlite3_table: "SQLite3 Таблица" From ec12292fc105816e0870aa4cef7b0b4cb1ef39cf Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 17 Jan 2019 20:00:05 +0300 Subject: [PATCH 0010/1219] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index eaa4e54e..ec70361f 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - source: /site/plugins/admin/languages/en.yaml - translation: /site/plugins/admin/languages/%locale%.yaml + translation: /site/plugins/admin/languages/%locale_with_underscore%.yaml From 0e4fdfe8543d24503037cb603587c5f824ac1df7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 17 Jan 2019 21:04:03 +0300 Subject: [PATCH 0011/1219] Rename en.yaml to en_US.yaml --- site/plugins/admin/languages/{en.yaml => en_US.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site/plugins/admin/languages/{en.yaml => en_US.yaml} (100%) diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en_US.yaml similarity index 100% rename from site/plugins/admin/languages/en.yaml rename to site/plugins/admin/languages/en_US.yaml From b1fe22f3d09589f9eda041dca4264c950fda9f9f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 17 Jan 2019 21:04:41 +0300 Subject: [PATCH 0012/1219] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index ec70361f..f536e778 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - - source: /site/plugins/admin/languages/en.yaml + - source: /site/plugins/admin/languages/en_US.yaml translation: /site/plugins/admin/languages/%locale_with_underscore%.yaml From 41e0d9c9311af34fbe253b8a22192c072d14ce84 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 17 Jan 2019 22:33:25 +0300 Subject: [PATCH 0013/1219] Flextype Core: Plugins - locales list - improved! --- flextype/Plugins.php | 319 ++++++++++++++++++------------------------- 1 file changed, 136 insertions(+), 183 deletions(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 2140a288..106880fb 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -33,189 +33,142 @@ class Plugins * @var array */ private static $locales = [ - 'om' => 'Afaan Oromoo', - 'aa' => 'Afaraf', - 'af' => 'Afrikaans', - 'ak' => 'Akan', - 'an' => 'aragonés', - 'ig' => 'Asụsụ Igbo', - 'gn' => 'Avañe\'ẽ', - 'ae' => 'avesta', - 'ay' => 'aymar aru', - 'az' => 'azərbaycan dili', - 'id' => 'Bahasa Indonesia', - 'ms' => 'bahasa Melayu', - 'bm' => 'bamanankan', - 'jv' => 'basa Jawa', - 'su' => 'Basa Sunda', - 'bi' => 'Bislama', - 'bs' => 'bosanski jezik', - 'br' => 'brezhoneg', - 'ca' => 'català', - 'ch' => 'Chamoru', - 'ny' => 'chiCheŵa', - 'sn' => 'chiShona', - 'co' => 'corsu', - 'cy' => 'Cymraeg', - 'da' => 'dansk', - 'se' => 'Davvisámegiella', - 'de' => 'Deutsch', - 'nv' => 'Diné bizaad', - 'et' => 'eesti', - 'na' => 'Ekakairũ Naoero', - 'en' => 'English', - 'es' => 'español', - 'eo' => 'Esperanto', - 'eu' => 'euskara', - 'ee' => 'Eʋegbe', - 'to' => 'faka Tonga', - 'mg' => 'fiteny malagasy', - 'fr' => 'français', - 'fy' => 'Frysk', - 'ff' => 'Fulfulde', - 'fo' => 'føroyskt', - 'ga' => 'Gaeilge', - 'gv' => 'Gaelg', - 'sm' => 'gagana fa\'a Samoa', - 'gl' => 'galego', - 'sq' => 'gjuha shqipe', - 'gd' => 'Gàidhlig', - 'ki' => 'Gĩkũyũ', - 'ha' => 'Hausa', - 'ho' => 'Hiri Motu', - 'hr' => 'hrvatski jezik', - 'io' => 'Ido', - 'rw' => 'Ikinyarwanda', - 'rn' => 'Ikirundi', - 'ia' => 'Interlingua', - 'nd' => 'isiNdebele', - 'nr' => 'isiNdebele', - 'xh' => 'isiXhosa', - 'zu' => 'isiZulu', - 'it' => 'italiano', - 'ik' => 'Iñupiaq', - 'pl' => 'język polski', - 'mh' => 'Kajin M̧ajeļ', - 'kl' => 'kalaallisut', - 'kr' => 'Kanuri', - 'kw' => 'Kernewek', - 'kg' => 'KiKongo', - 'sw' => 'Kiswahili', - 'ht' => 'Kreyòl ayisyen', - 'kj' => 'Kuanyama', - 'ku' => 'Kurdî', - 'la' => 'latine', - 'lv' => 'latviešu valoda', - 'lt' => 'lietuvių kalba', - 'ro' => 'limba română', - 'li' => 'Limburgs', - 'ln' => 'Lingála', - 'lg' => 'Luganda', - 'lb' => 'Lëtzebuergesch', - 'hu' => 'magyar', - 'mt' => 'Malti', - 'nl' => 'Nederlands', - 'no' => 'Norsk', - 'nb' => 'Norsk bokmål', - 'nn' => 'Norsk nynorsk', - 'uz' => 'O\'zbek', - 'oc' => 'occitan', - 'ie' => 'Interlingue', - 'hz' => 'Otjiherero', - 'ng' => 'Owambo', - 'pt' => 'português', - 'ty' => 'Reo Tahiti', - 'rm' => 'rumantsch grischun', - 'qu' => 'Runa Simi', - 'sc' => 'sardu', - 'za' => 'Saɯ cueŋƅ', - 'st' => 'Sesotho', - 'tn' => 'Setswana', - 'ss' => 'SiSwati', - 'sl' => 'slovenski jezik', - 'sk' => 'slovenčina', - 'so' => 'Soomaaliga', - 'fi' => 'suomi', - 'sv' => 'Svenska', - 'mi' => 'te reo Māori', - 'vi' => 'Tiếng Việt', - 'lu' => 'Tshiluba', - 've' => 'Tshivenḓa', - 'tw' => 'Twi', - 'tk' => 'Türkmen', - 'tr' => 'Türkçe', - 'ug' => 'Uyƣurqə', - 'vo' => 'Volapük', - 'fj' => 'vosa Vakaviti', - 'wa' => 'walon', - 'tl' => 'Wikang Tagalog', - 'wo' => 'Wollof', - 'ts' => 'Xitsonga', - 'yo' => 'Yorùbá', - 'sg' => 'yângâ tî sängö', - 'is' => 'Íslenska', - 'cs' => 'čeština', - 'el' => 'ελληνικά', - 'av' => 'авар мацӀ', - 'ab' => 'аҧсуа бызшәа', - 'ba' => 'башҡорт теле', - 'be' => 'беларуская мова', - 'bg' => 'български език', - 'os' => 'ирон æвзаг', - 'kv' => 'коми кыв', - 'ky' => 'Кыргызча', - 'mk' => 'македонски јазик', - 'mn' => 'монгол', - 'ce' => 'нохчийн мотт', - 'ru' => 'Русский язык', - 'sr' => 'српски језик', - 'tt' => 'татар теле', - 'tg' => 'тоҷикӣ', - 'uk' => 'Українська', - 'cv' => 'чӑваш чӗлхи', - 'cu' => 'ѩзыкъ словѣньскъ', - 'kk' => 'қазақ тілі', - 'hy' => 'Հայերեն', - 'yi' => 'ייִדיש', - 'he' => 'עברית', - 'ur' => 'اردو', - 'ar' => 'العربية', - 'fa' => 'فارسی', - 'ps' => 'پښتو', - 'ks' => 'कश्मीरी', - 'ne' => 'नेपाली', - 'pi' => 'पाऴि', - 'bh' => 'भोजपुरी', - 'mr' => 'मराठी', - 'sa' => 'संस्कृतम्', - 'sd' => 'सिन्धी', - 'hi' => 'हिन्दी', - 'as' => 'অসমীয়া', - 'bn' => 'বাংলা', - 'pa' => 'ਪੰਜਾਬੀ', - 'gu' => 'ગુજરાતી', - 'or' => 'ଓଡ଼ିଆ', - 'ta' => 'தமிழ்', - 'te' => 'తెలుగు', - 'kn' => 'ಕನ್ನಡ', - 'ml' => 'മലയാളം', - 'si' => 'සිංහල', - 'th' => 'ไทย', - 'lo' => 'ພາສາລາວ', - 'bo' => 'བོད་ཡིག', - 'dz' => 'རྫོང་ཁ', - 'my' => 'ဗမာစာ', - 'ka' => 'ქართული', - 'ti' => 'ትግርኛ', - 'am' => 'አማርኛ', - 'iu' => 'ᐃᓄᒃᑎᑐᑦ', - 'oj' => 'ᐊᓂᔑᓈᐯᒧᐎᓐ', - 'cr' => 'ᓀᐦᐃᔭᐍᐏᐣ', - 'km' => 'ខ្មែរ', - 'zh' => '中文 (Zhōngwén)', - 'ja' => '日本語 (にほんご)', - 'ii' => 'ꆈꌠ꒿ Nuosuhxop', - 'ko' => '한국어 (韓國語)' + 'af' => [ 'name' => 'Afrikaans', 'nativeName' => 'Afrikaans' ], + 'ak' => [ 'name' => 'Akan', 'nativeName' => 'Akan' ], // unverified native name + 'ast' => [ 'name' => 'Asturian', 'nativeName' => 'Asturianu' ], + 'ar' => [ 'name' => 'Arabic', 'nativeName' => 'عربي', 'orientation' => 'rtl'], + 'as' => [ 'name' => 'Assamese', 'nativeName' => 'অসমীয়া' ], + 'be' => [ 'name' => 'Belarusian', 'nativeName' => 'Беларуская' ], + 'bg' => [ 'name' => 'Bulgarian', 'nativeName' => 'Български' ], + 'bn' => [ 'name' => 'Bengali', 'nativeName' => 'বাংলা' ], + 'bn_BD' => [ 'name' => 'Bengali (Bangladesh)', 'nativeName' => 'বাংলা (বাংলাদেশ)' ], + 'bn_IN' => [ 'name' => 'Bengali (India)', 'nativeName' => 'বাংলা (ভারত)' ], + 'br' => [ 'name' => 'Breton', 'nativeName' => 'Brezhoneg' ], + 'bs' => [ 'name' => 'Bosnian', 'nativeName' => 'Bosanski' ], + 'ca' => [ 'name' => 'Catalan', 'nativeName' => 'Català' ], + 'ca_valencia'=> [ 'name' => 'Catalan (Valencian)', 'nativeName' => 'Català (valencià)' ], // not iso-639-1. a=l10n-drivers + 'cs' => [ 'name' => 'Czech', 'nativeName' => 'Čeština' ], + 'cy' => [ 'name' => 'Welsh', 'nativeName' => 'Cymraeg' ], + 'da' => [ 'name' => 'Danish', 'nativeName' => 'Dansk' ], + 'de' => [ 'name' => 'German', 'nativeName' => 'Deutsch' ], + 'de_AT' => [ 'name' => 'German (Austria)', 'nativeName' => 'Deutsch (Österreich)' ], + 'de_CH' => [ 'name' => 'German (Switzerland)', 'nativeName' => 'Deutsch (Schweiz)' ], + 'de_DE' => [ 'name' => 'German (Germany)', 'nativeName' => 'Deutsch (Deutschland)' ], + 'dsb' => [ 'name' => 'Lower Sorbian', 'nativeName' => 'Dolnoserbšćina' ], // iso-639-2 + 'el' => [ 'name' => 'Greek', 'nativeName' => 'Ελληνικά' ], + 'en' => [ 'name' => 'English', 'nativeName' => 'English' ], + 'en_AU' => [ 'name' => 'English (Australian)', 'nativeName' => 'English (Australian)' ], + 'en_CA' => [ 'name' => 'English (Canadian)', 'nativeName' => 'English (Canadian)' ], + 'en_GB' => [ 'name' => 'English (British)', 'nativeName' => 'English (British)' ], + 'en_NZ' => [ 'name' => 'English (New Zealand)', 'nativeName' => 'English (New Zealand)' ], + 'en_US' => [ 'name' => 'English (US)', 'nativeName' => 'English (US)' ], + 'en_ZA' => [ 'name' => 'English (South African)', 'nativeName' => 'English (South African)' ], + 'eo' => [ 'name' => 'Esperanto', 'nativeName' => 'Esperanto' ], + 'es' => [ 'name' => 'Spanish', 'nativeName' => 'Español' ], + 'es_AR' => [ 'name' => 'Spanish (Argentina)', 'nativeName' => 'Español (de Argentina)' ], + 'es_CL' => [ 'name' => 'Spanish (Chile)', 'nativeName' => 'Español (de Chile)' ], + 'es_ES' => [ 'name' => 'Spanish (Spain)', 'nativeName' => 'Español (de España)' ], + 'es_MX' => [ 'name' => 'Spanish (Mexico)', 'nativeName' => 'Español (de México)' ], + 'et' => [ 'name' => 'Estonian', 'nativeName' => 'Eesti keel' ], + 'eu' => [ 'name' => 'Basque', 'nativeName' => 'Euskara' ], + 'fa' => [ 'name' => 'Persian', 'nativeName' => 'فارسی' , 'orientation' => 'rtl' ], + 'fi' => [ 'name' => 'Finnish', 'nativeName' => 'Suomi' ], + 'fj_FJ' => [ 'name' => 'Fijian', 'nativeName' => 'Vosa vaka_Viti' ], + 'fr' => [ 'name' => 'French', 'nativeName' => 'Français' ], + 'fr_CA' => [ 'name' => 'French (Canada)', 'nativeName' => 'Français (Canada)' ], + 'fr_FR' => [ 'name' => 'French (France)', 'nativeName' => 'Français (France)' ], + 'fur' => [ 'name' => 'Friulian', 'nativeName' => 'Furlan' ], + 'fur_IT' => [ 'name' => 'Friulian', 'nativeName' => 'Furlan' ], + 'fy' => [ 'name' => 'Frisian', 'nativeName' => 'Frysk' ], + 'fy_NL' => [ 'name' => 'Frisian', 'nativeName' => 'Frysk' ], + 'ga' => [ 'name' => 'Irish', 'nativeName' => 'Gaeilge' ], + 'ga_IE' => [ 'name' => 'Irish (Ireland)', 'nativeName' => 'Gaeilge (Éire)' ], + 'gd' => [ 'name' => 'Gaelic (Scotland)', 'nativeName' => 'Gàidhlig' ], + 'gl' => [ 'name' => 'Galician', 'nativeName' => 'Galego' ], + 'gu' => [ 'name' => 'Gujarati', 'nativeName' => 'ગુજરાતી' ], + 'gu_IN' => [ 'name' => 'Gujarati', 'nativeName' => 'ગુજરાતી' ], + 'he' => [ 'name' => 'Hebrew', 'nativeName' => 'עברית', 'orientation' => 'rtl' ], + 'hi' => [ 'name' => 'Hindi', 'nativeName' => 'हिन्दी' ], + 'hi_IN' => [ 'name' => 'Hindi (India)', 'nativeName' => 'हिन्दी (भारत)' ], + 'hr' => [ 'name' => 'Croatian', 'nativeName' => 'Hrvatski' ], + 'hsb' => [ 'name' => 'Upper Sorbian', 'nativeName' => 'Hornjoserbsce' ], + 'hu' => [ 'name' => 'Hungarian', 'nativeName' => 'Magyar' ], + 'hy' => [ 'name' => 'Armenian', 'nativeName' => 'Հայերեն' ], + 'hy_AM' => [ 'name' => 'Armenian', 'nativeName' => 'Հայերեն' ], + 'id' => [ 'name' => 'Indonesian', 'nativeName' => 'Bahasa Indonesia' ], + 'is' => [ 'name' => 'Icelandic', 'nativeName' => 'íslenska' ], + 'it' => [ 'name' => 'Italian', 'nativeName' => 'Italiano' ], + 'ja' => [ 'name' => 'Japanese', 'nativeName' => '日本語' ], + 'ja_JP' => [ 'name' => 'Japanese', 'nativeName' => '日本語' ], // not iso-639-1 + 'ka' => [ 'name' => 'Georgian', 'nativeName' => 'ქართული' ], + 'kk' => [ 'name' => 'Kazakh', 'nativeName' => 'Қазақ' ], + 'kn' => [ 'name' => 'Kannada', 'nativeName' => 'ಕನ್ನಡ' ], + 'ko' => [ 'name' => 'Korean', 'nativeName' => '한국어' ], + 'ku' => [ 'name' => 'Kurdish', 'nativeName' => 'Kurdî' ], + 'la' => [ 'name' => 'Latin', 'nativeName' => 'Latina' ], + 'lb' => [ 'name' => 'Luxembourgish', 'nativeName' => 'Lëtzebuergesch' ], + 'lg' => [ 'name' => 'Luganda', 'nativeName' => 'Luganda' ], + 'lt' => [ 'name' => 'Lithuanian', 'nativeName' => 'Lietuvių kalba' ], + 'lv' => [ 'name' => 'Latvian', 'nativeName' => 'Latviešu' ], + 'mai' => [ 'name' => 'Maithili', 'nativeName' => 'मैथिली মৈথিলী' ], + 'mg' => [ 'name' => 'Malagasy', 'nativeName' => 'Malagasy' ], + 'mi' => [ 'name' => 'Maori (Aotearoa)', 'nativeName' => 'Māori (Aotearoa)' ], + 'mk' => [ 'name' => 'Macedonian', 'nativeName' => 'Македонски' ], + 'ml' => [ 'name' => 'Malayalam', 'nativeName' => 'മലയാളം' ], + 'mn' => [ 'name' => 'Mongolian', 'nativeName' => 'Монгол' ], + 'mr' => [ 'name' => 'Marathi', 'nativeName' => 'मराठी' ], + 'no' => [ 'name' => 'Norwegian', 'nativeName' => 'Norsk' ], + 'nb' => [ 'name' => 'Norwegian', 'nativeName' => 'Norsk' ], + 'nb_NO' => [ 'name' => 'Norwegian (Bokmål)', 'nativeName' => 'Norsk bokmål' ], + 'ne_NP' => [ 'name' => 'Nepali', 'nativeName' => 'नेपाली' ], + 'nn_NO' => [ 'name' => 'Norwegian (Nynorsk)', 'nativeName' => 'Norsk nynorsk' ], + 'nl' => [ 'name' => 'Dutch', 'nativeName' => 'Nederlands' ], + 'nr' => [ 'name' => 'Ndebele, South', 'nativeName' => 'IsiNdebele' ], + 'nso' => [ 'name' => 'Northern Sotho', 'nativeName' => 'Sepedi' ], + 'oc' => [ 'name' => 'Occitan (Lengadocian)', 'nativeName' => 'Occitan (lengadocian)' ], + 'or' => [ 'name' => 'Oriya', 'nativeName' => 'ଓଡ଼ିଆ' ], + 'pa' => [ 'name' => 'Punjabi', 'nativeName' => 'ਪੰਜਾਬੀ' ], + 'pa_IN' => [ 'name' => 'Punjabi', 'nativeName' => 'ਪੰਜਾਬੀ' ], + 'pl' => [ 'name' => 'Polish', 'nativeName' => 'Polski' ], + 'pt' => [ 'name' => 'Portuguese', 'nativeName' => 'Português' ], + 'pt_BR' => [ 'name' => 'Portuguese (Brazilian)', 'nativeName' => 'Português (do Brasil)' ], + 'pt_PT' => [ 'name' => 'Portuguese (Portugal)', 'nativeName' => 'Português (Europeu)' ], + 'ro' => [ 'name' => 'Romanian', 'nativeName' => 'Română' ], + 'rm' => [ 'name' => 'Romansh', 'nativeName' => 'Rumantsch' ], + 'ru' => [ 'name' => 'Russian', 'nativeName' => 'Русский' ], + 'rw' => [ 'name' => 'Kinyarwanda', 'nativeName' => 'Ikinyarwanda' ], + 'si' => [ 'name' => 'Sinhala', 'nativeName' => 'සිංහල' ], + 'sk' => [ 'name' => 'Slovak', 'nativeName' => 'Slovenčina' ], + 'sl' => [ 'name' => 'Slovenian', 'nativeName' => 'Slovensko' ], + 'son' => [ 'name' => 'Songhai', 'nativeName' => 'Soŋay' ], + 'sq' => [ 'name' => 'Albanian', 'nativeName' => 'Shqip' ], + 'sr' => [ 'name' => 'Serbian', 'nativeName' => 'Српски' ], + 'sr_Latn' => [ 'name' => 'Serbian', 'nativeName' => 'Srpski' ], // follows RFC 4646 + 'ss' => [ 'name' => 'Siswati', 'nativeName' => 'siSwati' ], + 'st' => [ 'name' => 'Southern Sotho', 'nativeName' => 'Sesotho' ], + 'sv' => [ 'name' => 'Swedish', 'nativeName' => 'Svenska' ], + 'sv_SE' => [ 'name' => 'Swedish', 'nativeName' => 'Svenska' ], + 'ta' => [ 'name' => 'Tamil', 'nativeName' => 'தமிழ்' ], + 'ta_IN' => [ 'name' => 'Tamil (India)', 'nativeName' => 'தமிழ் (இந்தியா)' ], + 'ta_LK' => [ 'name' => 'Tamil (Sri Lanka)', 'nativeName' => 'தமிழ் (இலங்கை)' ], + 'te' => [ 'name' => 'Telugu', 'nativeName' => 'తెలుగు' ], + 'th' => [ 'name' => 'Thai', 'nativeName' => 'ไทย' ], + 'tlh' => [ 'name' => 'Klingon', 'nativeName' => 'Klingon' ], + 'tn' => [ 'name' => 'Tswana', 'nativeName' => 'Setswana' ], + 'tr' => [ 'name' => 'Turkish', 'nativeName' => 'Türkçe' ], + 'ts' => [ 'name' => 'Tsonga', 'nativeName' => 'Xitsonga' ], + 'tt' => [ 'name' => 'Tatar', 'nativeName' => 'Tatarça' ], + 'tt_RU' => [ 'name' => 'Tatar', 'nativeName' => 'Tatarça' ], + 'uk' => [ 'name' => 'Ukrainian', 'nativeName' => 'Українська' ], + 'ur' => [ 'name' => 'Urdu', 'nativeName' => 'اُردو', 'orientation' => 'rtl' ], + 've' => [ 'name' => 'Venda', 'nativeName' => 'Tshivenḓa' ], + 'vi' => [ 'name' => 'Vietnamese', 'nativeName' => 'Tiếng Việt' ], + 'wo' => [ 'name' => 'Wolof', 'nativeName' => 'Wolof' ], + 'xh' => [ 'name' => 'Xhosa', 'nativeName' => 'isiXhosa' ], + 'zh' => [ 'name' => 'Chinese (Simplified)', 'nativeName' => '中文 (简体)' ], + 'zh_CN' => [ 'name' => 'Chinese (Simplified)', 'nativeName' => '中文 (简体)' ], + 'zh_TW' => [ 'name' => 'Chinese (Traditional)', 'nativeName' => '正體中文 (繁體)' ], + 'zu' => [ 'name' => 'Zulu', 'nativeName' => 'isiZulu' ] ]; /** From 7155e535d9101f7275bcf9174c4445b8d950eb81 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 17 Jan 2019 22:34:23 +0300 Subject: [PATCH 0014/1219] Admin Panel: Settings Manager - locales list - improvements! --- site/plugins/admin/classes/SettingsManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index e7adda80..f117ab48 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -65,7 +65,7 @@ class SettingsManager $locales = []; foreach ($available_locales as $locale) { - $locales[basename($locale, '.yaml')] = $system_locales[basename($locale, '.yaml')]; + $locales[basename($locale, '.yaml')] = $system_locales[basename($locale, '.yaml')]['nativeName']; } $entries = []; From 9f5bc4b98db15635f41d069f8dd9d1d1c62b88db Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 17 Jan 2019 22:35:29 +0300 Subject: [PATCH 0015/1219] Flextype Core: Using new languages files format --- site/plugins/admin/languages/{en.yaml => en_US.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site/plugins/admin/languages/{en.yaml => en_US.yaml} (100%) diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en_US.yaml similarity index 100% rename from site/plugins/admin/languages/en.yaml rename to site/plugins/admin/languages/en_US.yaml From 7b981ad70cd649ac887b2e591305e7cad60972c9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:10:35 +0300 Subject: [PATCH 0016/1219] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bc628b83..3c259939 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Flextype -[![Discord](https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat&style=flat-square)](https://discordapp.com/invite/CCKPKVG) -![Version](https://img.shields.io/badge/version-0.8.3-brightgreen.svg?style=flat-square) -![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square) +[![Discord](https://img.shields.io/discord/423097982498635778.svg)](https://discordapp.com/invite/CCKPKVG) +[![Crowdin](https://d322cqt584bo4o.cloudfront.net/flextype/localized.svg)](https://crowdin.com/project/flextype) +![Version](https://img.shields.io/badge/version-0.8.3-brightgreen.svg) +![MIT License](https://img.shields.io/badge/license-MIT-blue.svg) ![preview](/site/plugins/admin/preview.png) From f4e26607c0b129a046732d0eb8e74574a3133311 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:12:29 +0300 Subject: [PATCH 0017/1219] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c259939..39dcd9b7 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Flextype -[![Discord](https://img.shields.io/discord/423097982498635778.svg)](https://discordapp.com/invite/CCKPKVG) +[![Discord](https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://discordapp.com/invite/CCKPKVG) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/flextype/localized.svg)](https://crowdin.com/project/flextype) ![Version](https://img.shields.io/badge/version-0.8.3-brightgreen.svg) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg) From ca4b93885560997d26d9413e4cdced63540bd2ef Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:14:16 +0300 Subject: [PATCH 0018/1219] Update README.md --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39dcd9b7..818ef343 100755 --- a/README.md +++ b/README.md @@ -1,10 +1,15 @@ -# Flextype +
+ +![preview](/site/plugins/admin/preview.png) + [![Discord](https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://discordapp.com/invite/CCKPKVG) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/flextype/localized.svg)](https://crowdin.com/project/flextype) ![Version](https://img.shields.io/badge/version-0.8.3-brightgreen.svg) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg) -![preview](/site/plugins/admin/preview.png) +# Flextype + +
Flextype is Open Source, fast and flexible file-based Content Management System. That's Easy to install, upgrade and use. Flextype provides amazing API's for plugins, themes and core developers! From a5335676d037206139a46fe23fa048125cf3159f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:20:11 +0300 Subject: [PATCH 0019/1219] Update README.md --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 818ef343..6d7c0864 100755 --- a/README.md +++ b/README.md @@ -1,15 +1,18 @@ -
![preview](/site/plugins/admin/preview.png) - -[![Discord](https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://discordapp.com/invite/CCKPKVG) -[![Crowdin](https://d322cqt584bo4o.cloudfront.net/flextype/localized.svg)](https://crowdin.com/project/flextype) -![Version](https://img.shields.io/badge/version-0.8.3-brightgreen.svg) -![MIT License](https://img.shields.io/badge/license-MIT-blue.svg) + +

+ Discord + Crowdin + Version + Version +

+ # Flextype -
+ + Flextype is Open Source, fast and flexible file-based Content Management System. That's Easy to install, upgrade and use. Flextype provides amazing API's for plugins, themes and core developers! From b7ae05dd4aa82e38a48f2270e30bbd1df1e6b6b0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:24:55 +0300 Subject: [PATCH 0020/1219] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6d7c0864..3b440195 100755 --- a/README.md +++ b/README.md @@ -2,10 +2,11 @@ ![preview](/site/plugins/admin/preview.png)

- Discord - Crowdin Version - Version + License + Total downloads + Crowdin + Discord

From e0265cb8401bae4c8c39d7f8c4a8bc9b27caaf64 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:27:03 +0300 Subject: [PATCH 0021/1219] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3b440195..95b5700c 100755 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ Make sure your server meets the following requirements. Flextype needs the following PHP extensions to be enabled: - Multibyte String +- PHP Fileinfo - SPL Although it is optional, we strongly recommend enabling the following PHP extensions: From 1c3b5d0ff8e6f6e9640cf9bedeca865952c78c93 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 18 Jan 2019 01:31:15 +0300 Subject: [PATCH 0022/1219] Admin Panel: preview image updated --- site/plugins/admin/preview.png | Bin 141503 -> 145189 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/site/plugins/admin/preview.png b/site/plugins/admin/preview.png index 0b777c24b9bc897f880588f390ab1fb0a2bc7efa..ae3b5d407229f4b105eb9bb527dd7543629753b7 100644 GIT binary patch literal 145189 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 R`?~*))Kt||DOIux{y*G(>i7Tv literal 141503 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

- Version + undefined License - Total downloads + Total downloads Crowdin Discord

From b3f7882f9c0619e0bf5b30737bc9b7e093ba64cc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 02:04:33 +0300 Subject: [PATCH 0025/1219] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b104a52c..fee804bb 100755 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ Flextype is an open source project and community contributions are essential to * Find and [report issues.](https://github.com/flextype/flextype/issues) * Link back to [Flextype](http://flextype.org). * [Donate to keep Flextype free.](http://flextype.org/about/sponsors) +* [Join Flextype International Translator Team](https://crowdin.com/project/flextype/invite) ## LINKS From 709686b615a75d89bb129b38a8fba8a6ff0c2264 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:09 +0300 Subject: [PATCH 0026/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/af_ZA.yaml diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From a1de2683e5fa87ca7f819e75c20539412997f927 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:10 +0300 Subject: [PATCH 0027/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/ja_JP.yaml diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 6f855c31ccc13c4a3d43c36941853ea9475d8fd9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:12 +0300 Subject: [PATCH 0028/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/uk_UA.yaml diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 53b3b3ee3af07c11cfb3ef9d24d05dbb5b9d5d28 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:13 +0300 Subject: [PATCH 0029/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/tr_TR.yaml diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From c8147741fb860806a02b746a3bee64f0691b9536 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:15 +0300 Subject: [PATCH 0030/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/sv_SE.yaml diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 388f0dc264b68a0046032908069f229d5418eff3 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:16 +0300 Subject: [PATCH 0031/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/es_ES.yaml diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/es_ES.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From ad0ea172dc6db6bea2ef2fe785c89987b62c81cc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:18 +0300 Subject: [PATCH 0032/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/sr_SP.yaml diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From db32485586e66834fd28eb3b4210f4c44e25e63f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:19 +0300 Subject: [PATCH 0033/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/ru_RU.yaml diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml new file mode 100644 index 00000000..2d79b23f --- /dev/null +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -0,0 +1,188 @@ +--- +admin: "Админ" +admin_cancel: "Отмена" +admin_create: "Создать" +admin_debugging: "Отладка" +admin_email: "E-mail" +admin_flextype_version: "Flextype Версия" +admin_information: "Информация" +admin_installed: "Установлено" +admin_keywords: "Ключевые слова" +admin_login: "Логин" +admin_entries: "Записи" +admin_extends: "Расширения" +admin_plugins: "Плагины" +admin_themes: "Темы" +admin_help: "Помощь" +admin_getting_help: "Документация" +admin_logout: "Выход" +admin_profile: "Профайл" +admin_view_site: "Просмотреть Сайт" +admin_snippets: "Сниппеты" +admin_not_installed: "Не установлено" +admin_off: "Выключено" +admin_on: "Включено" +admin_add: "Добавить" +admin_entry_attributes: "Атрибуты Записи" +admin_fieldset_for_template: "Набор полей для шаблона" +admin_content: "Контент" +admin_create_new_entry: "Создать Новую Запись" +admin_date: "Дата" +admin_draft: "Черновик" +admin_edit: "Редактировать" +admin_menus: "Меню" +admin_blocks: "Блоки" +admin_media: "Медиа" +admin_settings: "Настройки" +admin_templates: "Шаблоны" +admin_entry: "Записи" +admin_fieldset: "Поле" +admin_source: "Код" +admin_files: "Файлы" +admin_upload: "Загрузить" +admin_hidden: "Скрытый" +admin_image_preview: "Просмотр изображения" +admin_move: "Переместить" +admin_parent_entry: "Родитель записи" +admin_preview: "Просмотр" +admin_publish: "Публиковать" +admin_rename: "Переименовать" +admin_save_entry: "Сохранить запись" +admin_template: "Шаблон" +admin_title: "Заголовок" +admin_url: "Ссылка" +admin_view: "Просмотр" +admin_visibility: "Видимость" +admin_visible: "Видимый" +admin_password: "Пароль" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Версия" +admin_author_url: "Ссылка Автора" +admin_bugs: "Баги" +admin_description: "Описание" +admin_get_more_plugins: "Скачать Новые Плагины" +admin_homepage: "Домашняя страничка" +admin_info: "Информация" +admin_license: "Лицензия" +admin_status: "Статус" +admin_disabled: "Выключено" +admin_enabled: "Включено" +admin_version: "Версия" +admin_role: "Роль" +admin_save: "Сохранить" +admin_security_check_results: "Результаты проверки безопасности" +admin_security_check_results_debug: "Система работает в режиме ОТЛАДКИ Мы рекомендуем вам УБРАТЬ режим ОТЛАДКИ на живом сайте." +admin_security_check_results_htaccess: "Главный .htaccess доступен для записи. Мы рекомендуем вам удалить права записи на главный .htaccess файл.
Вы можете сделать это на UNIX системах так: chmod -R a-w :path" +admin_security_check_results_index: "Главный index.php файл доступен для записи. Мы рекомендуем вам удалить права записи на главный index.php файл.
Вы можете сделать это на UNIX системах так: chmod -R a-w :path" +admin_server: "Сервер" +admin_site: "Сайт" +admin_clear_cache: "Очистить кеш" +admin_error404_title: "Заголовок страницы про - Ошибку 404" +admin_error404_description: "Описание страницы про - Ошибку 404" +admin_error404_content: "Контент страницы про - Ошибку 404" +admin_error404_template: "Шаблон страницы про - Ошибку 404" +admin_heading: "Настройки" +admin_general: "Основное" +admin_error_404_page: "Страница ошибки 404" +admin_cache: "Кеш" +admin_author_email: "Почта автора" +admin_author_name: "Имя автора" +admin_site_description: "Описание сайта" +admin_site_keywords: "Ключевые слова сайта" +admin_site_robots: "Роботы" +admin_site_title: "Заголовок сайта" +admin_system: "Система" +admin_cache_driver: "Драйвер кеша" +admin_cache_enabled: "Кэш включен" +admin_cache_lifetime: "Время жизни кеша" +admin_cache_prefix: "Префикс кэша" +admin_charset: "Кодировка" +admin_date_format: "Формат даты" +admin_errors_display: "Показать ошибки" +admin_locale: "Местонахождение" +admin_entry_main: "Главная запись" +admin_theme: "Тема" +admin_timezone: "Часовой пояс" +admin_username: "Имя пользователя" +admin_create_user: "Создать пользователя" +admin_create_new_user: "Создать нового пользователя" +admin_web_server: "Веб-сервер" +admin_web_server_php_interface: "PHP интерфейс веб-сервера" +admin_menu: "Меню" +admin_create_new_category: "Создать новую категорию" +admin_delete_category: "Удалить категорию" +admin_create_new_item: "Создать Новый Элемент" +admin_delete: "Удалить" +admin_order: "Счет" +admin_edit_category: "Редактировать категорию" +admin_create_new_menu: "Создать новое меню" +admin_fieldsets: "Поля" +admin_template_create_new: "Создать новый шаблон" +admin_create_new_fieldset: "Создать новый набор полей" +admin_duplicate: "Дублировать" +admin_summary: "Краткое описание" +admin_snippet: "Сниппет" +admin_type: "Тип" +admin_partial: "Партиал" +admin_clone: "Клон" +admin_create_new_snippet: "Создать новый сниппет" +admin_create_new_template: "Создать новый шаблон" +admin_message_template_created: "Шаблон создан" +admin_message_template_deleted: "Шаблон удален" +admin_message_template_renamed: "Шаблон переименован" +admin_message_template_duplicated: "Шаблон дублировался" +admin_message_template_saved: "Шаблон сохранен" +admin_message_snippet_saved: "Сниппет сохранен" +admin_message_snippet_created: "Сниппет создан" +admin_message_snippet_deleted: "Сниппет удален" +admin_message_snippet_renamed: "Сниппет переименован" +admin_message_snippet_duplicated: "Сниппет дублирован " +admin_message_menu_saved: "Меню сохранено" +admin_message_menu_created: "Меню создано" +admin_message_menu_deleted: "Меню удалено" +admin_message_menu_renamed: "Меню переименовано" +admin_message_menu_duplicated: "Меню дублировалось" +admin_message_fieldset_saved: "Набор полей сохранен" +admin_message_fieldset_created: "Набор полей создан" +admin_message_fieldset_deleted: "Набор полей удален" +admin_message_fieldset_renamed: "Набор полей создан" +admin_message_fieldset_duplicated: "Набор полей удален" +admin_message_entry_duplicated: "Запись дублировалась" +admin_message_cache_files_deleted: "Файлы кеша удалены" +admin_message_entry_changes_saved: "Изменения успешно сохранены" +admin_message_entry_cloned: "Запись клонировалась" +admin_message_entry_created: "Запись создана" +admin_message_entry_deleted: "Запись удалена" +admin_message_entry_file_deleted: "Файл успешно удален" +admin_message_entry_file_uploaded: "Файл успешно загружен" +admin_message_entry_file_not_uploaded: "Файл не был загружен" +admin_message_entry_moved: "Запись перемещена" +admin_message_entry_renamed: "Запись переименована" +admin_message_settings_saved: "Настройки сохранены" +admin_message_wrong_username_password: "Неверное имя пользователя или пароль" +admin_quality: "Качество" +admin_width: "Ширина" +admin_height: "Высота" +admin_accept_file_types: "Допустимые типы файлов" +admin_embeded_code: "Встроенный код" +admin_shortcode: "Короткий код" +admin_php_code: "PHP код" +admin_choose_files_to_upload: "Выберите файл" +admin_browse_files: "Просмотреть" +admin_copy: "Копировать" +admin_admin_panel: "Админ панель" +admin_light: "Светлый" +admin_dark: "Темный" +admin_name: "Название" +admin_memcache_server: "Сервер Memcache" +admin_memcache_port: "Порт Memcache" +admin_memcached_server: "Сервер Memcache" +admin_memcached_port: "Порт Memcache" +admin_redis_socket: "Сокет Redis" +admin_redis_password: "Redis пароль" +admin_redis_server: "Сервер Redis" +admin_redis_port: "Redis Порт" +admin_sqlite3_database: "База данных SQLite3" +admin_sqlite3_table: "Таблица SQLite3" +admin_error_name_empty_input: "Название должно быть буквенно-цифровое значение (от 1 симв.)" +admin_error_title_empty_input: "Заголовок должен иметь буквенно-цифровое значение (от 1 симв.)" From 3b515dd20948d15605acd80736b45b8a2f5918b6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:20 +0300 Subject: [PATCH 0034/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/ro_RO.yaml diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 86721550725467e7fe70394f3f82d012cd09b10a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:22 +0300 Subject: [PATCH 0035/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/pt_BR.yaml diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 327388b316d054e46178379de24fdc5222b15972 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:23 +0300 Subject: [PATCH 0036/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/pt_PT.yaml diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 93e3dc8953b2fcb671680e081a6fee313252bb90 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:25 +0300 Subject: [PATCH 0037/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/pl_PL.yaml diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml new file mode 100644 index 00000000..83d86e62 --- /dev/null +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Anuluj" +admin_create: "Stwórz" +admin_debugging: "Debugowanie" +admin_email: "Email" +admin_flextype_version: "Wersja Flextype" +admin_information: "Informacja" +admin_installed: "Zainstalowany" +admin_keywords: "Słowa kluczowe" +admin_login: "Zaloguj" +admin_entries: "Wpisy" +admin_extends: "Rozszerzenia" +admin_plugins: "Wtyczki" +admin_themes: "Motywy" +admin_help: "Pomoc" +admin_getting_help: "Pomoc" +admin_logout: "Wyloguj" +admin_profile: "Profil" +admin_view_site: "Wyświetl stronę" +admin_snippets: "Fragmenty kodu" +admin_not_installed: "Nie Zainstalowany" +admin_off: "Wyłączony" +admin_on: "Włączony" +admin_add: "Dodaj" +admin_entry_attributes: "Atrybuty wpisu" +admin_fieldset_for_template: "Zestaw pól szablonu" +admin_content: "Zawartość" +admin_create_new_entry: "Utwórz nowy wpis" +admin_date: "Data" +admin_draft: "Szkic" +admin_edit: "Edytuj" +admin_menus: "Menu" +admin_blocks: "Bloki" +admin_media: "Media" +admin_settings: "Ustawienia" +admin_templates: "Szablony" +admin_entry: "Wpis" +admin_fieldset: "Zestaw pól" +admin_source: "Źródło" +admin_files: "Pliki" +admin_upload: "Wrzuć plik" +admin_hidden: "Ukryty" +admin_image_preview: "Podgląd obrazu" +admin_move: "Przenieś" +admin_parent_entry: "Wpis nadrzędny" +admin_preview: "Podgląd" +admin_publish: "Opublikuj" +admin_rename: "Zmień nazwę" +admin_save_entry: "Zapisz wpis" +admin_template: "Szablon" +admin_title: "Tytuł" +admin_url: "Adres URL" +admin_view: "Widok" +admin_visibility: "Widoczność" +admin_visible: "Widoczny" +admin_password: "Hasło" +admin_php_built_on: "PHP wbudowane" +admin_php_version: "Wersja PHP" +admin_author_url: "URL Autora" +admin_bugs: "Błędy" +admin_description: "Opis" +admin_get_more_plugins: "Więcej wtyczek" +admin_homepage: "Strona główna" +admin_info: "Info" +admin_license: "Licencja" +admin_status: "Status" +admin_disabled: "wyłączone" +admin_enabled: "włączone" +admin_version: "Wersja" +admin_role: "Rola" +admin_save: "Zapisz" +admin_security_check_results: "Wyniki kontroli bezpieczeństwa" +admin_security_check_results_debug: "Ze względu na rodzaj i ilość informacji wyświetlenie błędu może umożliwić intruzowi dostęp, gdy włącvzona jest opcja POKAŻ BŁĘDY, zalecamy wyłączenie opcji POKAŻ BŁĘDY w systemach produkcyjnych." +admin_security_check_results_htaccess: "Plik Flexhtpe .htaccess posiada uprawnienia zapisu. Zalecamy usunięcie wszystkich uprawnień do zapisu.
Możesz to zrobić na systemach uniksowych z: chmod a-w :path" +admin_security_check_results_index: "Plik Flexhtpe index.php posiada uprawnienia zapisu. Zalecamy usunięcie wszystkich uprawnień do zapisu.
Możesz to zrobić na systemach uniksowych z: chmod a-w :path" +admin_server: "Serwer" +admin_site: "Strona" +admin_clear_cache: "Wyczyść pamięć podręczną" +admin_error404_title: "Tytuł błędu Error404" +admin_error404_description: "Opis błędu Error404" +admin_error404_content: "Treść błędu Error404" +admin_error404_template: "Szablon błędu Error404" +admin_heading: "Ustawienia" +admin_general: "Ogólne" +admin_error_404_page: "Strona błędu 404" +admin_cache: "Pamięć podręczna" +admin_author_email: "Email Autora" +admin_author_name: "Imię Autora" +admin_site_description: "Opis strony" +admin_site_keywords: "Słowa kluczowe" +admin_site_robots: "Roboty" +admin_site_title: "Nazwa strony" +admin_system: "System" +admin_cache_driver: "Sterownik pamięci podręcznej" +admin_cache_enabled: "Pamięć podręczna włączona" +admin_cache_lifetime: "Czas pamięci podręcznej" +admin_cache_prefix: "Przedrostek pamięci podręcznej" +admin_charset: "Zestaw znaków" +admin_date_format: "Format daty" +admin_errors_display: "Pokaż błędy" +admin_locale: "Ustawienia regionalne" +admin_entry_main: "Strona główna witryny" +admin_theme: "Motyw" +admin_timezone: "Strefa czasowa" +admin_username: "Nazwa Użytkownika" +admin_create_user: "Utwórz użytkownika" +admin_create_new_user: "Utwórz nowego użytkownika" +admin_web_server: "Serwer internetowy" +admin_web_server_php_interface: "Serwer internetowy do interfejsu PHP" +admin_menu: "Menu" +admin_create_new_category: "Utwórz nową kategorię" +admin_delete_category: "Usuń kategorię" +admin_create_new_item: "Utwórz nową pozycję" +admin_delete: "Kasuj" +admin_order: "Kolejność" +admin_edit_category: "Edytuj kategorię" +admin_create_new_menu: "Utwórz nowe menu" +admin_fieldsets: "Zestawy pól" +admin_template_create_new: "Utwórz nowy szablon" +admin_create_new_fieldset: "Utwórz nowy zestaw pól" +admin_duplicate: "Kopiuj" +admin_summary: "Streszczenie" +admin_snippet: "Fragment kodu" +admin_type: "Rodzaj" +admin_partial: "Częściowy" +admin_clone: "Kopiuj" +admin_create_new_snippet: "Utwórz nowy fragment kodu" +admin_create_new_template: "Utwórz nowy szablon" +admin_message_template_created: "Szablon utworzony" +admin_message_template_deleted: "Szablon został usunięty" +admin_message_template_renamed: "Zmieniono nazwę szablonu" +admin_message_template_duplicated: "Szablon został skopiowany" +admin_message_template_saved: "Szablon został zapisany" +admin_message_snippet_saved: "fragment kodu został zapisany" +admin_message_snippet_created: "Utworzono fragment kodu" +admin_message_snippet_deleted: "Fragment kodu usunięty" +admin_message_snippet_renamed: "Zmieniono nazwę fragmentu kodu" +admin_message_snippet_duplicated: "Fragment kodu został skopiowany" +admin_message_menu_saved: "Zapisano menu" +admin_message_menu_created: "Utworzono menu" +admin_message_menu_deleted: "Menu usunięte" +admin_message_menu_renamed: "Zmieniono nazwę menu" +admin_message_menu_duplicated: "Menu zostało skopiowane" +admin_message_fieldset_saved: "Zapisano zestaw pól" +admin_message_fieldset_created: "Utworzono zestaw pól" +admin_message_fieldset_deleted: "Zestaw pól został usunięty" +admin_message_fieldset_renamed: "Zmieniono nazwę zestaw pól" +admin_message_fieldset_duplicated: "Zestaw pól został skopiowany" +admin_message_entry_duplicated: "Wpis został skopiowany" +admin_message_cache_files_deleted: "Pliki pamięci podręcznej zostały usunięte" +admin_message_entry_changes_saved: "Zmiany zostały pomyślnie zapisane" +admin_message_entry_cloned: "Wpis został skopiowany" +admin_message_entry_created: "Utworzono wpis" +admin_message_entry_deleted: "Wpis został usunięty" +admin_message_entry_file_deleted: "Plik został pomyślnie usunięty" +admin_message_entry_file_uploaded: "Plik został pomyślnie przesłany" +admin_message_entry_file_not_uploaded: "Plik nie został przesłany" +admin_message_entry_moved: "Wpis został przeniesiony" +admin_message_entry_renamed: "Zmieniono nazwę wpisu" +admin_message_settings_saved: "Ustawienia zapisane" +admin_message_wrong_username_password: "Zła nazwa użytkownika lub hasło" +admin_quality: "Jakość" +admin_width: "Szerokość" +admin_height: "Wysokość" +admin_accept_file_types: "Dopuszczalne typy plików" +admin_embeded_code: "Wbudowany kod" +admin_shortcode: "Krótki kod" +admin_php_code: "Kod PHP" +admin_choose_files_to_upload: "Wybierz plik" +admin_browse_files: "Przeglądaj" +admin_copy: "Kopiuj" +admin_admin_panel: "Panel administratora" +admin_light: "Jasny" +admin_dark: "Ciemny" +admin_name: "Nazwa" +admin_memcache_server: "Serwer Memcache" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Serwer" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Hasło" +admin_redis_server: "Redis Serwer" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "Baza danych SQLite3" +admin_sqlite3_table: "Tabela SQLite3" +admin_error_name_empty_input: "Nazwa musi być wartością alfanumeryczną" +admin_error_title_empty_input: "Tytuł musi być wartością alfanumeryczną" From 117b81dbfc9da051cd66b55b9336056ac245e684 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:26 +0300 Subject: [PATCH 0038/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/no_NO.yaml diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/no_NO.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 1dbcdf30a86d5d66291d9b692253c9daf7811345 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:28 +0300 Subject: [PATCH 0039/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/ko_KR.yaml diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From c5157abb9ceae85b84feb37301c8a31682ef5038 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:29 +0300 Subject: [PATCH 0040/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/it_IT.yaml diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/it_IT.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 8f5370df6faf9f4eca135bdfcc124e6f614a3dcc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:31 +0300 Subject: [PATCH 0041/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/ar_SA.yaml diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From ed6e9bfc78fd6d8cd762afc95f091979bfa96936 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:32 +0300 Subject: [PATCH 0042/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/hu_HU.yaml diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 71899ca4345f6ff7c2dc117088b59843da1fbe97 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:33 +0300 Subject: [PATCH 0043/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/he_IL.yaml diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/he_IL.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 397f529aa5af61325a06ef285251b0b6f78b3b0a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:34 +0300 Subject: [PATCH 0044/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/el_GR.yaml diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/el_GR.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From d3c2b5da95e8be0770318e4a7c7de1137d997002 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:36 +0300 Subject: [PATCH 0045/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/de_DE.yaml diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml new file mode 100644 index 00000000..a71da1a6 --- /dev/null +++ b/site/plugins/admin/languages/de_DE.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Abbrechen" +admin_create: "Erstellen" +admin_debugging: "Debuggen" +admin_email: "E-Mail" +admin_flextype_version: "Flextype Version" +admin_information: "Informationen" +admin_installed: "Installiert" +admin_keywords: "Schlagwörter" +admin_login: "Login" +admin_entries: "Einträge" +admin_extends: "Erweiterungen" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Hilfe" +admin_getting_help: "Dokumentation" +admin_logout: "Ausloggen" +admin_profile: "Profil" +admin_view_site: "Seite ansehen" +admin_snippets: "Schnipsel" +admin_not_installed: "Nicht installiert" +admin_off: "Aus" +admin_on: "An" +admin_add: "Hinzufügen" +admin_entry_attributes: "Eintragsattribute" +admin_fieldset_for_template: "Fieldset für Vorlage" +admin_content: "Inhalt" +admin_create_new_entry: "Neuen Eintrag erstellen" +admin_date: "Datum" +admin_draft: "Entwurf" +admin_edit: "Bearbeiten" +admin_menus: "Menüs" +admin_blocks: "Blöcke" +admin_media: "Medien" +admin_settings: "Einstellungen" +admin_templates: "Vorlagen" +admin_entry: "Eintrag" +admin_fieldset: "Fieldset" +admin_source: "Quelle" +admin_files: "Dateien" +admin_upload: "Hochladen" +admin_hidden: "Versteckt" +admin_image_preview: "Bildvorschau" +admin_move: "Verschieben" +admin_parent_entry: "Übergeordneter Eintrag" +admin_preview: "Vorschau" +admin_publish: "Veröffentlichen" +admin_rename: "Umbenennen" +admin_save_entry: "Eintrag speichern" +admin_template: "Vorlage" +admin_title: "Titel" +admin_url: "Url" +admin_view: "Ansehen" +admin_visibility: "Sichtbarkeit" +admin_visible: "Sichtbar" +admin_password: "Passwort" +admin_php_built_on: "Basiert auf PHP" +admin_php_version: "PHP Version" +admin_author_url: "Autor Url" +admin_bugs: "Fehler" +admin_description: "Beschreibung" +admin_get_more_plugins: "Mehr Plugins finden" +admin_homepage: "Startseite" +admin_info: "Info" +admin_license: "Lizenz" +admin_status: "Status" +admin_disabled: "deaktiviert" +admin_enabled: "aktiviert" +admin_version: "Version" +admin_role: "Rolle" +admin_save: "Speichern" +admin_security_check_results: "Ergebnisse der Sicherheitsprüfung" +admin_security_check_results_debug: "Aufgrund des Typs und der Menge an Informationen die das Anzeigen von Fehlern an böswillige Besucher ausgeben könnte empfehlen wir ausdrücklich auf Produktivinstallationen diese Option zu deaktivieren." +admin_security_check_results_htaccess: "Die Flextype .htaccess Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun." +admin_security_check_results_index: "Die Flextype index.php Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun." +admin_server: "Server" +admin_site: "Seite" +admin_clear_cache: "Cache löschen" +admin_error404_title: "Fehler 404 Eintrag Titel" +admin_error404_description: "Fehler 404 Eintrag Beschreibung" +admin_error404_content: "Fehler 404 Eintrag Inhalt" +admin_error404_template: "Fehler 404 Eintrag Vorlage" +admin_heading: "Einstellungen" +admin_general: "Allgemein" +admin_error_404_page: "Fehler 404 Eintrag" +admin_cache: "Cache" +admin_author_email: "Autor E-Mail" +admin_author_name: "Autor Name" +admin_site_description: "Seitenbeschreibung" +admin_site_keywords: "Seitenschlagwörter" +admin_site_robots: "Robots" +admin_site_title: "Seitentitel" +admin_system: "System" +admin_cache_driver: "Cachetreiber" +admin_cache_enabled: "Cache aktiviert" +admin_cache_lifetime: "Cache Lebenszeit" +admin_cache_prefix: "Cache Prefix" +admin_charset: "Zeichensatz" +admin_date_format: "Datumsformat" +admin_errors_display: "Fehler anzeigen" +admin_locale: "Sprache" +admin_entry_main: "Startseite" +admin_theme: "Theme" +admin_timezone: "Zeitzone" +admin_username: "Benutzername" +admin_create_user: "Benutzer erstellen" +admin_create_new_user: "Neuen Benutzer anlegen" +admin_web_server: "Webserver" +admin_web_server_php_interface: "PHP-Schnittstelle" +admin_menu: "Menü" +admin_create_new_category: "Neue Kategorie anlegen" +admin_delete_category: "Kategorie löschen" +admin_create_new_item: "Neuen Eintrag erstellen" +admin_delete: "Löschen" +admin_order: "Reihenfolge" +admin_edit_category: "Kategorie bearbeiten" +admin_create_new_menu: "Neues Menü erstellen" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Neue Vorlage erstellen" +admin_create_new_fieldset: "Neues Fieldset erstellen" +admin_duplicate: "Duplizieren" +admin_summary: "Zusammenfassung" +admin_snippet: "Schnipsel" +admin_type: "Typ" +admin_partial: "Partial" +admin_clone: "Duplizieren" +admin_create_new_snippet: "Neuen Schnipsel erstellen" +admin_create_new_template: "Neue Vorlage erstellen" +admin_message_template_created: "Vorlage erstellt" +admin_message_template_deleted: "Vorlage gelöscht" +admin_message_template_renamed: "Vorlage umbenannt" +admin_message_template_duplicated: "Vorlage dupliziert" +admin_message_template_saved: "Vorlage gespeichert" +admin_message_snippet_saved: "Schnipsel gespeichert" +admin_message_snippet_created: "Schnipsel erstellt" +admin_message_snippet_deleted: "Schnipsel gelöscht" +admin_message_snippet_renamed: "Schnipsel umbenannt" +admin_message_snippet_duplicated: "Schnipsel dupliziert" +admin_message_menu_saved: "Menü gespeichert" +admin_message_menu_created: "Menü erstellt" +admin_message_menu_deleted: "Menü gelöscht" +admin_message_menu_renamed: "Menü umbenannt" +admin_message_menu_duplicated: "Menü dupliziert" +admin_message_fieldset_saved: "Fieldset gespeichert" +admin_message_fieldset_created: "Fieldset erstellt" +admin_message_fieldset_deleted: "Fieldset gelöscht" +admin_message_fieldset_renamed: "Fieldset umbenannt" +admin_message_fieldset_duplicated: "Fieldset dupliziert" +admin_message_entry_duplicated: "Eintrag dupliziert" +admin_message_cache_files_deleted: "Cache Dateien gelöscht" +admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" +admin_message_entry_cloned: "Eintrag dupliziert" +admin_message_entry_created: "Eintrag erstellt" +admin_message_entry_deleted: "Eintrag gelöscht" +admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" +admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" +admin_message_entry_file_not_uploaded: "Datei konnte nicht hochgeladen werden" +admin_message_entry_moved: "Eintrag verschoben" +admin_message_entry_renamed: "Eintrag umbenannt" +admin_message_settings_saved: "Einstellungen gespeichert" +admin_message_wrong_username_password: "Benutzername oder Passwort falsch" +admin_quality: "Qualität" +admin_width: "Breite" +admin_height: "Höhe" +admin_accept_file_types: "Erlaubte Dateitypen" +admin_embeded_code: "Eingebetteter Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Datei auswählen" +admin_browse_files: "Durchsuchen" +admin_copy: "Kopieren" +admin_admin_panel: "Admin Panel" +admin_light: "Hell" +admin_dark: "Dunkel" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Passwort" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Datenbank" +admin_sqlite3_table: "SQLite3 Tabelle" +admin_error_name_empty_input: "Name muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" +admin_error_title_empty_input: "Titel muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" From ade448d85ffd6b5010be2d7ab0eb2b4f330018f5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:37 +0300 Subject: [PATCH 0046/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/fr_FR.yaml diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 1e7d80a27a6e7fa8f9f34c9046c54e6afe1af314 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:39 +0300 Subject: [PATCH 0047/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/fi_FI.yaml diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From a326576a709e638d269ee27a0f1edf6a068d7e37 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:40 +0300 Subject: [PATCH 0048/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/nl_NL.yaml diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml new file mode 100644 index 00000000..73c4fc43 --- /dev/null +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -0,0 +1,188 @@ +--- +admin: "Beheerder" +admin_cancel: "Annuleren" +admin_create: "Creëren" +admin_debugging: "Debuggen" +admin_email: "E-mail" +admin_flextype_version: "Flextype versie" +admin_information: "Informatie" +admin_installed: "Geïnstalleerd" +admin_keywords: "Trefwoorden" +admin_login: "Aanmelden" +admin_entries: "Entries" +admin_extends: "Uitbreiden" +admin_plugins: "Plugins" +admin_themes: "Thema's" +admin_help: "Help" +admin_getting_help: "Help-informatie opvragen" +admin_logout: "Uitloggen" +admin_profile: "Profiel" +admin_view_site: "Bekijk site" +admin_snippets: "Tekstfragmenten" +admin_not_installed: "Niet geïnstalleerd" +admin_off: "Uit" +admin_on: "Aan" +admin_add: "Toevoegen" +admin_entry_attributes: "Invoerattributen" +admin_fieldset_for_template: "Fieldset voor sjabloon" +admin_content: "Inhoud" +admin_create_new_entry: "Maak een nieuwe invoer" +admin_date: "Datum" +admin_draft: "Klad" +admin_edit: "Bewerk" +admin_menus: "Menu's" +admin_blocks: "Blokken" +admin_media: "Media" +admin_settings: "Instellingen" +admin_templates: "Sjablonen" +admin_entry: "Invoer" +admin_fieldset: "Veldenset" +admin_source: "Bron" +admin_files: "Bestanden" +admin_upload: "Uploaden" +admin_hidden: "Verborgen" +admin_image_preview: "Image voorbeeld" +admin_move: "Verplaatsen" +admin_parent_entry: "Toegangsouder" +admin_preview: "Voorbeeld" +admin_publish: "Publiceren" +admin_rename: "Naam Wijzigen" +admin_save_entry: "Invoer opslaan" +admin_template: "Sjablonen" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Hoofdingang" +admin_theme: "Thema" +admin_timezone: "Tijdzone" +admin_username: "Gebruikersnaam" +admin_create_user: "Gebruiker Aanmaken" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From fd3fd6047abd7869624f0f92a95d24ad55a33d36 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:41 +0300 Subject: [PATCH 0049/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/da_DK.yaml diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/da_DK.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From c51e300b5bba14495d2534678ce5062c2d60ab1a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:43 +0300 Subject: [PATCH 0050/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/cs_CZ.yaml diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml new file mode 100644 index 00000000..52aab209 --- /dev/null +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Zpět" +admin_create: "Vytvořit" +admin_debugging: "Zobrazování chybových hlášek" +admin_email: "E-mail" +admin_flextype_version: "Verze Flextype" +admin_information: "Information" +admin_installed: "Instalováno" +admin_keywords: "Klíčová slova" +admin_login: "Přihlášení" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "Zobrazit web" +admin_snippets: "Výstřižky kódu" +admin_not_installed: "Není instalováno" +admin_off: "zakázáno" +admin_on: "povoleno" +admin_add: "Přidat" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Obsah" +admin_create_new_entry: "Create New Entry" +admin_date: "Datum" +admin_draft: "Draft" +admin_edit: "Upravit" +admin_menus: "Menu" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Nastavení" +admin_templates: "Šablony" +admin_entry: "Entry" +admin_fieldset: "Datové pole" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Přesunout" +admin_parent_entry: "Entry parent" +admin_preview: "Náhled" +admin_publish: "Publish" +admin_rename: "Přejmenovat" +admin_save_entry: "Save entry" +admin_template: "Šablona" +admin_title: "Název" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Viditelnost" +admin_visible: "Visible" +admin_password: "Heslo" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Popis" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Uložit" +admin_security_check_results: "Výsledek bezpečnostního testu" +admin_security_check_results_debug: "Zobrazování chybových hlášek představuje velké bezpečnostní riziko. Proto důrazně doporučujeme na produkčním webu zobrazování chybových hlášek zakázat!" +admin_security_check_results_htaccess: "Soubor .htaccess je zapisovatelný. Doporučujeme odstranit všechna práva k zápisu.
Na unix systémech to můžete udělat pomocí příkazu: chmod a-w :path" +admin_security_check_results_index: "Soubor index.php je zapisovatelný. Doporučujeme odstranit všechna práva k zápisu.
Na unix systémech to můžete udělat pomocí příkazu: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Uživatelské jméno" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Vytvořit nové menu" +admin_fieldsets: "Datová pole" +admin_template_create_new: "Vytvořit novou šablonu" +admin_create_new_fieldset: "Vytvořit nové datové pole" +admin_duplicate: "Duplikovat" +admin_summary: "Souhrn" +admin_snippet: "Výstřižek kódu" +admin_type: "Typ" +admin_partial: "Partial" +admin_clone: "Duplikovat" +admin_create_new_snippet: "Vytvořit nový výstřižek kódu" +admin_create_new_template: "Vytvořit novou šablonu" +admin_message_template_created: "Šablona byla vytvořena" +admin_message_template_deleted: "Šablona byla odstraněna" +admin_message_template_renamed: "Šablona byla přejmenována" +admin_message_template_duplicated: "Šablona byla duplikována" +admin_message_template_saved: "Šablona byla uložena" +admin_message_snippet_saved: "Výstřižek kódu uložen" +admin_message_snippet_created: "Výstřižek kódu vytvořen" +admin_message_snippet_deleted: "Výstřižek kódu odstraněn" +admin_message_snippet_renamed: "Výstřižek kódu přejmenován" +admin_message_snippet_duplicated: "Výstřižek kódu duplikován" +admin_message_menu_saved: "Menu uloženo" +admin_message_menu_created: "Menu vytvořeno" +admin_message_menu_deleted: "Menu odstraněno" +admin_message_menu_renamed: "Menu přejmenováno" +admin_message_menu_duplicated: "Menu duplikováno" +admin_message_fieldset_saved: "Datové pole uloženo" +admin_message_fieldset_created: "Datové pole vytvořeno" +admin_message_fieldset_deleted: "Datové pole odstraněno" +admin_message_fieldset_renamed: "Datové pole přejmenováno" +admin_message_fieldset_duplicated: "Datové pole duplikováno" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Soubory cache byly odstraněny" +admin_message_entry_changes_saved: "Změny byly uloženy" +admin_message_entry_cloned: "Stránka byla duplikována" +admin_message_entry_created: "Stránka byla vytvořena" +admin_message_entry_deleted: "Stránka byla odstraněna" +admin_message_entry_file_deleted: "Soubor byl odstraněn" +admin_message_entry_file_uploaded: "Soubor byl v pořádku nahrán" +admin_message_entry_file_not_uploaded: "Soubor nebyl nahrán" +admin_message_entry_moved: "Stránka byla přesunuta" +admin_message_entry_renamed: "Stránka byla přejmenována" +admin_message_settings_saved: "Nastavení uloženo" +admin_message_wrong_username_password: "Špatné uživatelské jméno nebo heslo" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Vložený kód" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Zkopírovat" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Jméno" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From d6adf845108b23ca0e0d745ecec36d7fcb15e0e3 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:44 +0300 Subject: [PATCH 0051/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/hr_HR.yaml diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml new file mode 100644 index 00000000..f2c05d6c --- /dev/null +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Otkaži" +admin_create: "Stvori" +admin_debugging: "Otklanjanje grešaka" +admin_email: "Email" +admin_flextype_version: "Flextype Verzija" +admin_information: "Informacija" +admin_installed: "Instalirano" +admin_keywords: "Ključne riječi" +admin_login: "Prijava" +admin_entries: "Unosi" +admin_extends: "Proširuje" +admin_plugins: "Dodaci" +admin_themes: "Teme" +admin_help: "Pomoć" +admin_getting_help: "Getting Help" +admin_logout: "Odjava" +admin_profile: "Profil" +admin_view_site: "Vidi Sajt" +admin_snippets: "Snippets" +admin_not_installed: "Nije instalirano" +admin_off: "Isključeno" +admin_on: "Uključeno" +admin_add: "Dodaj" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Sadržaj" +admin_create_new_entry: "Stvori novi" +admin_date: "Datum" +admin_draft: "Skica" +admin_edit: "Uredi" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Postavke" +admin_templates: "Predlošci" +admin_entry: "Unos" +admin_fieldset: "Fieldset" +admin_source: "Izvor" +admin_files: "Fajlovi" +admin_upload: "Postavljanje" +admin_hidden: "Skriveno" +admin_image_preview: "Pregled slike" +admin_move: "Pomakni" +admin_parent_entry: "Entry parent" +admin_preview: "Pregled" +admin_publish: "Objavi" +admin_rename: "Preimenuj" +admin_save_entry: "Sačuvaj" +admin_template: "Predložak" +admin_title: "Ime" +admin_url: "Link" +admin_view: "Pogledaj" +admin_visibility: "Vidljivost" +admin_visible: "Vidljivo" +admin_password: "Lozinka" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP verzija" +admin_author_url: "Link Autora" +admin_bugs: "Greške" +admin_description: "Opis" +admin_get_more_plugins: "Nabavi više dodataka" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "Licenca" +admin_status: "Status" +admin_disabled: "onemogućeno" +admin_enabled: "omogućeno" +admin_version: "Verzija" +admin_role: "Uloga" +admin_save: "Sačuvaj" +admin_security_check_results: "Rezultati sigurnosne provjere" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Sajt" +admin_clear_cache: "Očisti cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Postavke" +admin_general: "Generalno" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "email autora" +admin_author_name: "Ime autora" +admin_site_description: "Opis stranice" +admin_site_keywords: "Ključne riječi stranice" +admin_site_robots: "Roboti" +admin_site_title: "Ime sajta" +admin_system: "Sustav" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache je omogućen" +admin_cache_lifetime: "Životni vijek predmemorije" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Format datuma" +admin_errors_display: "Prikaži greške" +admin_locale: "Jezik" +admin_entry_main: "Glavni unos" +admin_theme: "Tema" +admin_timezone: "Vremenska zona" +admin_username: "Korisničko ime" +admin_create_user: "Stvori korisnika" +admin_create_new_user: "Stvori novog korisnika" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Sučelje" +admin_menu: "Menu" +admin_create_new_category: "Stvori novu kategoriju" +admin_delete_category: "Obriši kategoriju" +admin_create_new_item: "Stvori novu stavku" +admin_delete: "Obriši" +admin_order: "Redoslijed" +admin_edit_category: "Uredi kategoriju" +admin_create_new_menu: "Stvori novi menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Stvori novi predložak" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Dupliciraj" +admin_summary: "Sažetak" +admin_snippet: "Svaštica" +admin_type: "Tip" +admin_partial: "Partial" +admin_clone: "Kloniraj" +admin_create_new_snippet: "Stvori novu svašticu" +admin_create_new_template: "Stvori novi predložak" +admin_message_template_created: "Predložak je stvoren" +admin_message_template_deleted: "Predložak je obrisan" +admin_message_template_renamed: "Predložak je preimenovan" +admin_message_template_duplicated: "Predložak je dupliciran" +admin_message_template_saved: "Predložak je sačuvan" +admin_message_snippet_saved: "Svaštica je sačuvana" +admin_message_snippet_created: "Svaštica je stvorena" +admin_message_snippet_deleted: "Svaštica je obrisana" +admin_message_snippet_renamed: "Svaštica je preimenovana" +admin_message_snippet_duplicated: "Svaštica je duplicirana" +admin_message_menu_saved: "Menu je sačuvan" +admin_message_menu_created: "Menu je stvoren" +admin_message_menu_deleted: "Menu je obrisan" +admin_message_menu_renamed: "Menu je preimenovan" +admin_message_menu_duplicated: "Menu je dupliciran" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Unos je dupliciran" +admin_message_cache_files_deleted: "Cache fajlovi su obrisani" +admin_message_entry_changes_saved: "Promjene su uspješno sačuvane" +admin_message_entry_cloned: "Unos je kloniran" +admin_message_entry_created: "Unos je stvoren" +admin_message_entry_deleted: "Unos je obrisan" +admin_message_entry_file_deleted: "Fajl je uspješno obrisan" +admin_message_entry_file_uploaded: "Fajl je uspješno uploadan" +admin_message_entry_file_not_uploaded: "Fajl nije uploadan" +admin_message_entry_moved: "Unos je premješten" +admin_message_entry_renamed: "Unos je preimenovan" +admin_message_settings_saved: "Postavke su sačuvane" +admin_message_wrong_username_password: "Pogrešno korisničko ime ili lozinka" +admin_quality: "Kvaliteta" +admin_width: "Širina" +admin_height: "Visina" +admin_accept_file_types: "Prihvati tipove podataka" +admin_embeded_code: "Ugrađivanje koda" +admin_shortcode: "Shortcode" +admin_php_code: "PHP kod" +admin_choose_files_to_upload: "Odaberi fajl" +admin_browse_files: "Pretražuj" +admin_copy: "Kopiraj" +admin_admin_panel: "Administratorsko sučelje" +admin_light: "Svjetla" +admin_dark: "Tamna" +admin_name: "Ime" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 databaza" +admin_sqlite3_table: "SQLite3 Tablica" +admin_error_name_empty_input: "Ime mora biti alfanumerička vrijednost" +admin_error_title_empty_input: "Naslov mora biti alfanumerička vrijednost" From 6b9e06a4697ef8e4f667d219bb6965fa24cea5f8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:45 +0300 Subject: [PATCH 0052/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/zh_TW.yaml diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 94f71b039679095ad85001b12f6a076a4c210c37 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:47 +0300 Subject: [PATCH 0053/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/zh_CN.yaml diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From f19ec4147de4d71ba0f80d1badef91431bb692f3 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:48 +0300 Subject: [PATCH 0054/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/ca_ES.yaml diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 7e613e1fce1ce3584bdeaed4d4e4835243ad6c2e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 13:47:49 +0300 Subject: [PATCH 0055/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 site/plugins/admin/languages/vi_VN.yaml diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml new file mode 100644 index 00000000..374ecc75 --- /dev/null +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -0,0 +1,188 @@ +--- +admin: "Admin" +admin_cancel: "Cancel" +admin_create: "Create" +admin_debugging: "Debugging" +admin_email: "Email" +admin_flextype_version: "Flextype Version" +admin_information: "Information" +admin_installed: "Installed" +admin_keywords: "Keywords" +admin_login: "Login" +admin_entries: "Entries" +admin_extends: "Extends" +admin_plugins: "Plugins" +admin_themes: "Themes" +admin_help: "Help" +admin_getting_help: "Getting Help" +admin_logout: "Logout" +admin_profile: "Profile" +admin_view_site: "View Site" +admin_snippets: "Snippets" +admin_not_installed: "Not Installed" +admin_off: "Off" +admin_on: "On" +admin_add: "Add" +admin_entry_attributes: "Entry Attributes" +admin_fieldset_for_template: "Fieldset for template" +admin_content: "Content" +admin_create_new_entry: "Create New Entry" +admin_date: "Date" +admin_draft: "Draft" +admin_edit: "Edit" +admin_menus: "Menus" +admin_blocks: "Blocks" +admin_media: "Media" +admin_settings: "Settings" +admin_templates: "Templates" +admin_entry: "Entry" +admin_fieldset: "Fieldset" +admin_source: "Source" +admin_files: "Files" +admin_upload: "Upload" +admin_hidden: "Hidden" +admin_image_preview: "Image preview" +admin_move: "Move" +admin_parent_entry: "Entry parent" +admin_preview: "Preview" +admin_publish: "Publish" +admin_rename: "Rename" +admin_save_entry: "Save entry" +admin_template: "Template" +admin_title: "Title" +admin_url: "Url" +admin_view: "View" +admin_visibility: "Visibility" +admin_visible: "Visible" +admin_password: "Password" +admin_php_built_on: "PHP Built On" +admin_php_version: "PHP Version" +admin_author_url: "Author url" +admin_bugs: "Bugs" +admin_description: "Description" +admin_get_more_plugins: "Get More Plugins" +admin_homepage: "Homepage" +admin_info: "Info" +admin_license: "License" +admin_status: "Status" +admin_disabled: "disabled" +admin_enabled: "enabled" +admin_version: "Version" +admin_role: "Role" +admin_save: "Save" +admin_security_check_results: "Security check results" +admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" +admin_server: "Server" +admin_site: "Site" +admin_clear_cache: "Clear cache" +admin_error404_title: "Error404 entry title" +admin_error404_description: "Error404 entry description" +admin_error404_content: "Error404 entry content" +admin_error404_template: "Error404 entry template" +admin_heading: "Settings" +admin_general: "General" +admin_error_404_page: "Error 404 page" +admin_cache: "Cache" +admin_author_email: "Author email" +admin_author_name: "Author name" +admin_site_description: "Site description" +admin_site_keywords: "Site keywords" +admin_site_robots: "Robots" +admin_site_title: "Site title" +admin_system: "System" +admin_cache_driver: "Cache driver" +admin_cache_enabled: "Cache enabled" +admin_cache_lifetime: "Cache lifetime" +admin_cache_prefix: "Cache prefix" +admin_charset: "Charset" +admin_date_format: "Date format" +admin_errors_display: "Display errors" +admin_locale: "Locale" +admin_entry_main: "Main entry" +admin_theme: "Theme" +admin_timezone: "Timezone" +admin_username: "Username" +admin_create_user: "Create User" +admin_create_new_user: "Create New User" +admin_web_server: "Web Server" +admin_web_server_php_interface: "WebServer to PHP Interface" +admin_menu: "Menu" +admin_create_new_category: "Create New Category" +admin_delete_category: "Delete Category" +admin_create_new_item: "Create New Item" +admin_delete: "Delete" +admin_order: "Order" +admin_edit_category: "Edit category" +admin_create_new_menu: "Create New Menu" +admin_fieldsets: "Fieldsets" +admin_template_create_new: "Create New Template" +admin_create_new_fieldset: "Create New Fieldset" +admin_duplicate: "Duplicate" +admin_summary: "Summary" +admin_snippet: "Snippet" +admin_type: "Type" +admin_partial: "Partial" +admin_clone: "Clone" +admin_create_new_snippet: "Create New Snippet" +admin_create_new_template: "Create New Template" +admin_message_template_created: "Template created" +admin_message_template_deleted: "Template deleted" +admin_message_template_renamed: "Template renamed" +admin_message_template_duplicated: "Template duplicated" +admin_message_template_saved: "Template saved" +admin_message_snippet_saved: "Snippet saved" +admin_message_snippet_created: "Snippet created" +admin_message_snippet_deleted: "Snippet deleted" +admin_message_snippet_renamed: "Snippet renamed" +admin_message_snippet_duplicated: "Snippet duplicated" +admin_message_menu_saved: "Menu saved" +admin_message_menu_created: "Menu created" +admin_message_menu_deleted: "Menu deleted" +admin_message_menu_renamed: "Menu renamed" +admin_message_menu_duplicated: "Menu duplicated" +admin_message_fieldset_saved: "Fieldset saved" +admin_message_fieldset_created: "Fieldset created" +admin_message_fieldset_deleted: "Fieldset deleted" +admin_message_fieldset_renamed: "Fieldset renamed" +admin_message_fieldset_duplicated: "Fieldset duplicated" +admin_message_entry_duplicated: "Entry duplicated" +admin_message_cache_files_deleted: "Cache files deleted" +admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_cloned: "Entry cloned" +admin_message_entry_created: "Entry created" +admin_message_entry_deleted: "Entry deleted" +admin_message_entry_file_deleted: "File successfully deleted" +admin_message_entry_file_uploaded: "File successfully uploaded" +admin_message_entry_file_not_uploaded: "File was not uploaded" +admin_message_entry_moved: "Entry moved" +admin_message_entry_renamed: "Entry renamed" +admin_message_settings_saved: "Settings saved" +admin_message_wrong_username_password: "Wrong username or password" +admin_quality: "Quality" +admin_width: "Width" +admin_height: "Height" +admin_accept_file_types: "Accept file types" +admin_embeded_code: "Embeded Code" +admin_shortcode: "Shortcode" +admin_php_code: "PHP Code" +admin_choose_files_to_upload: "Choose file" +admin_browse_files: "Browse" +admin_copy: "Copy" +admin_admin_panel: "Admin Panel" +admin_light: "Light" +admin_dark: "Dark" +admin_name: "Name" +admin_memcache_server: "Memcache Server" +admin_memcache_port: "Memcache Port" +admin_memcached_server: "Memcached Server" +admin_memcached_port: "Memcached Port" +admin_redis_socket: "Redis Socket" +admin_redis_password: "Redis Password" +admin_redis_server: "Redis Server" +admin_redis_port: "Redis Port" +admin_sqlite3_database: "SQLite3 Database" +admin_sqlite3_table: "SQLite3 Table" +admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" +admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" From 0c213ec10e32656febf27a1c2dbeac5164a4c659 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 19 Jan 2019 13:51:25 +0300 Subject: [PATCH 0056/1219] Flextype Core: Entries - new methods added - new method updateCurrentEntryField() - new method updateCurrentEntry() --- flextype/Entries.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 9e69769b..c14a0d61 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -131,14 +131,28 @@ class Entries /** * Update current entry * - * Entries::updateCurrentPage('title', 'New entry title'); + * Entries::updateCurrentEntry(['title' => "New Title"]); + * + * @access public + * @param array $data Data + * @return void + */ + public static function updateCurrentEntry(array $data) : void + { + Entries::$entry = $data; + } + + /** + * Update current entry field + * + * Entries::updateCurrentEntryField('title', "New Title"); * * @access public * @param string $path Array path * @param mixed $value Value to set * @return void */ - public static function updateCurrentEntry(string $path, $value) : void + public static function updateCurrentEntryField(string $path, $value) : void { Arr::set(Entries::$entry, $path, $value); } From 776752f10a6c825f5d6d8f327a80f4ccd3e7682f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 15:03:02 +0300 Subject: [PATCH 0057/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 374ecc75..652e1036 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -1,18 +1,18 @@ --- -admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" -admin_debugging: "Debugging" +admin: "Administração" +admin_cancel: "Cancelar" +admin_create: "Criar" +admin_debugging: "Depuração" admin_email: "Email" -admin_flextype_version: "Flextype Version" +admin_flextype_version: "Versão Flextype" admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" -admin_entries: "Entries" -admin_extends: "Extends" +admin_installed: "Instalado" +admin_keywords: "Palavras-chave" +admin_login: "Iniciar sessão" +admin_entries: "Posts" +admin_extends: "Estender" admin_plugins: "Plugins" -admin_themes: "Themes" +admin_themes: "Temas" admin_help: "Help" admin_getting_help: "Getting Help" admin_logout: "Logout" @@ -61,17 +61,17 @@ admin_author_url: "Author url" admin_bugs: "Bugs" admin_description: "Description" admin_get_more_plugins: "Get More Plugins" -admin_homepage: "Homepage" +admin_homepage: "Página inicial" admin_info: "Info" -admin_license: "License" +admin_license: "Licença" admin_status: "Status" -admin_disabled: "disabled" -admin_enabled: "enabled" +admin_disabled: "desativado" +admin_enabled: "ativado" admin_version: "Version" -admin_role: "Role" +admin_role: "Posição" admin_save: "Save" -admin_security_check_results: "Security check results" -admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." +admin_security_check_results: "Resultados da verificação de segurança" +admin_security_check_results_debug: "Devido ao tipo e quantidade de informações que dê um erro intrusos quando exibir erros TRUE, recomendamos a configuração exibir erros falsos nos sistemas de produção." admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" admin_server: "Server" From c4c9ccdb24bec9c1a39546866704b6d2fcbd4adb Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 19 Jan 2019 15:55:39 +0300 Subject: [PATCH 0058/1219] Update admin theme to the php template syntax guidelines --- site/plugins/admin/views/partials/footer.php | 4 ++-- site/plugins/admin/views/partials/head.php | 22 +++++++++++--------- site/plugins/admin/views/partials/tail.php | 6 +++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/site/plugins/admin/views/partials/footer.php b/site/plugins/admin/views/partials/footer.php index da9bf92b..435c7eeb 100755 --- a/site/plugins/admin/views/partials/footer.php +++ b/site/plugins/admin/views/partials/footer.php @@ -1,8 +1,8 @@ - + -display() ?> + display() ?> diff --git a/site/plugins/admin/views/partials/head.php b/site/plugins/admin/views/partials/head.php index c4d638df..30ba9a88 100755 --- a/site/plugins/admin/views/partials/head.php +++ b/site/plugins/admin/views/partials/head.php @@ -16,7 +16,7 @@ use function Flextype\Component\I18n\__; - + FLEXTYPE @@ -26,15 +26,17 @@ use function Flextype\Component\I18n\__; - - + + - + - - - + + + + + - + - class="content-full-size" > + class="content-full-size" >
- display(); ?> + display() ?>
diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 8d80681a..882cbae6 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -20,9 +20,9 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets theme: 'flat' } - Messenger().post({ type: "success", message : "", hideAfter: '3' }); - Messenger().post({ type: "warning", message : "", hideAfter: '3' }); - Messenger().post({ type: "error", message : "", hideAfter: '3' }); + Messenger().post({ type: "success", message : "", hideAfter: '3' }); + Messenger().post({ type: "warning", message : "", hideAfter: '3' }); + Messenger().post({ type: "error", message : "", hideAfter: '3' }); if (typeof $.flextype == 'undefined') $.flextype = {}; From d680d0517b21da28390db9838c2b976789f24b07 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 19 Jan 2019 16:10:40 +0300 Subject: [PATCH 0059/1219] fix issue with locales for editor --- site/plugins/admin/views/partials/tail.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 882cbae6..924ab11f 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -3,8 +3,14 @@ namespace Flextype; use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets, Notification\Notification}; ?> + + + + + + - + @@ -75,7 +81,7 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets ['removeformat'], ['fullscreen'] ], - lang: '', + lang: '', autogrow: false, removeformatPasted: true }); From 2782df8cae3704112c7e9890a438b27f467cebae Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 19 Jan 2019 16:21:49 +0300 Subject: [PATCH 0060/1219] Admin Panel: issue with js error for codemirror - fixed --- site/plugins/admin/views/partials/tail.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 924ab11f..d07d0728 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -134,20 +134,21 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets $.validate({}); + var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), { lineNumbers: true, - + indentUnit: 2, tabSize: 2, - + tabSize: 4, indentUnit: 4, - - + + mode: "yaml", - + mode: "application/x-httpd-php", - + indentWithTabs: false, theme: "elegant", @@ -177,6 +178,7 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets cm.indentSelection("subtract"); } }); + }); From 1e48b672eb1ba122205df2ba3c6c4ec6408d1845 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 17:04:03 +0300 Subject: [PATCH 0061/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index f2c05d6c..980091b6 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -18,7 +18,7 @@ admin_getting_help: "Getting Help" admin_logout: "Odjava" admin_profile: "Profil" admin_view_site: "Vidi Sajt" -admin_snippets: "Snippets" +admin_snippets: "Svaštice" admin_not_installed: "Nije instalirano" admin_off: "Isključeno" admin_on: "Uključeno" @@ -30,13 +30,13 @@ admin_create_new_entry: "Stvori novi" admin_date: "Datum" admin_draft: "Skica" admin_edit: "Uredi" -admin_menus: "Menus" -admin_blocks: "Blocks" +admin_menus: "Menui" +admin_blocks: "Blokovi" admin_media: "Media" admin_settings: "Postavke" admin_templates: "Predlošci" admin_entry: "Unos" -admin_fieldset: "Fieldset" +admin_fieldset: "Skup polja" admin_source: "Izvor" admin_files: "Fajlovi" admin_upload: "Postavljanje" @@ -61,7 +61,7 @@ admin_author_url: "Link Autora" admin_bugs: "Greške" admin_description: "Opis" admin_get_more_plugins: "Nabavi više dodataka" -admin_homepage: "Homepage" +admin_homepage: "Početna stranica" admin_info: "Info" admin_license: "Licenca" admin_status: "Status" From 32d3ec9e044eb3d86fe0e88bd24d649dc7253987 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 19 Jan 2019 17:33:13 +0300 Subject: [PATCH 0062/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 374ecc75..04921cf2 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -1,5 +1,5 @@ --- -admin: "Admin" +admin: "Адмін" admin_cancel: "Cancel" admin_create: "Create" admin_debugging: "Debugging" From 43d1b71219bf03e8cca0bd620dd6a2b3b8cd8747 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 20 Jan 2019 12:35:36 +0300 Subject: [PATCH 0063/1219] Flextype Core: "flextype-components/arr" : "1.2.5" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2c8817c3..21373072 100755 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "doctrine/cache": "1.8.0", "symfony/yaml": "4.2.2", "thunderer/shortcode": "0.7.0", - "flextype-components/arr" : "1.2.4", + "flextype-components/arr" : "1.2.5", "flextype-components/assets" : "1.0.1", "flextype-components/cookie" : "1.2.0", "flextype-components/date" : "1.0.0", From 046bf6bb271c2fbb5b124bbea94a3241f0ad820a Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 01:33:34 +0300 Subject: [PATCH 0064/1219] Flextype Core: typo updates --- CHANGELOG.md | 2 ++ CONTRIBUTING.md | 1 + README.md | 2 +- flextype/Entries.php | 2 +- flextype/Flextype.php | 2 +- flextype/Images.php | 4 ++-- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59341474..5f1fe920 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [0.8.4] - 2019-01-xx + ## [0.8.3] - 2019-01-16 ### Added - Admin Panel: New Gorgeous Light Theme for Admin panel! diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fe7a9e9e..bbe2660e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,3 +7,4 @@ Flextype is an open source project and community contributions are essential to * Find and [report issues.](https://github.com/flextype/flextype/issues) * Link back to [Flextype](http://flextype.org). * [Donate to keep Flextype free.](http://flextype.org/about/sponsors) +* [Join Flextype International Translator Team](https://crowdin.com/project/flextype/invite) diff --git a/README.md b/README.md index fee804bb..8e89c30b 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ undefined License Total downloads - Crowdin + Crowdin Discord

diff --git a/flextype/Entries.php b/flextype/Entries.php index c14a0d61..9b7ba12d 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -118,7 +118,7 @@ class Entries /** * Get current entry * - * $entry = Entries::getCurrentPage(); + * $entry = Entries::getCurrentEntry(); * * @access public * @return array diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 561308ca..91f04317 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -144,7 +144,7 @@ class Flextype */ private static function setConfig() : void { - // Set empty site settings array + // Set empty settings array Registry::set('settings', []); // Set settings files path diff --git a/flextype/Images.php b/flextype/Images.php index 33c93358..3d303d4c 100644 --- a/flextype/Images.php +++ b/flextype/Images.php @@ -216,7 +216,7 @@ class Images * @param array $params Image params * @return string */ - public static function getImageUrl($path, array $params) + public static function getImageUrl(string $path, array $params) : string { if (file_exists(PATH['entries'] . '/' . $path)) { return Http::getBaseUrl() . '/site/cache/glide/' . Images::$server->makeImage($path, $params); @@ -237,7 +237,7 @@ class Images * @param array $attributes Image html attributes * @return string */ - public static function getImage($path, array $params, array $attributes = []) + public static function getImage(string $path, array $params, array $attributes = []) : string { if (file_exists(PATH['entries'] . '/' . $path)) { return ''; From 74b011087fbf3486e01bd0a39c95c9d77917f0e4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 01:35:55 +0300 Subject: [PATCH 0065/1219] Flextype Core: typo updates --- composer.json | 2 +- flextype/config/settings.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 21373072..5f5d3a9c 100755 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "flextype/flextype", "type": "project", - "description": "Modern Open Source Flat-File Content Management System", + "description": "Build fast, flexible, easier to manage websites with Flextype.", "keywords": ["flextype", "php", "cms", "flat-file cms", "flat cms", "flatfile cms", "html"], "homepage": "http://flextype.org", "license": "MIT", diff --git a/flextype/config/settings.yaml b/flextype/config/settings.yaml index 927292f6..a5432a2f 100644 --- a/flextype/config/settings.yaml +++ b/flextype/config/settings.yaml @@ -2,7 +2,7 @@ title: "Flextype" # The description of the website -description: "Modern Open Source Flat-File Content Management System" +description: "Build fast, flexible, easier to manage websites with Flextype." # The keywords of the website keywords: "flextype, php, cms, flat-file cms, flat cms, flatfile cms, html" From 6384806c81887a8b81e2a7531c9915d41e1a3612 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 17:57:48 +0300 Subject: [PATCH 0066/1219] Flextype Core: new Frontmatter Parser - added. --- flextype/Entries.php | 20 +-------------- flextype/parsers/FrontmatterParser.php | 35 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 flextype/parsers/FrontmatterParser.php diff --git a/flextype/Entries.php b/flextype/Entries.php index 9b7ba12d..8427e9e5 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -339,24 +339,6 @@ class Entries return Entries::$shortcode; } - /** - * Front matter parser - * - * $content = Entries::frontMatterParser($content); - * - * @param string $content Content to parse - * @access public - * @return array - */ - public static function frontMatterParser(string $content) : array - { - $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL.ltrim($content)); - - if (count($parts) < 3) return ['matter' => [], 'body' => $content]; - - return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL.'---'.PHP_EOL, array_slice($parts, 2))]; - } - /** * Process entry * @@ -379,7 +361,7 @@ class Entries } else { // Create $entry_frontmatter and $entry_content - $entry = Entries::frontMatterParser($entry); + $entry = FrontmatterParser::parse($entry); $entry_frontmatter = $entry['matter']; $entry_content = $entry['body']; diff --git a/flextype/parsers/FrontmatterParser.php b/flextype/parsers/FrontmatterParser.php new file mode 100644 index 00000000..e139fdea --- /dev/null +++ b/flextype/parsers/FrontmatterParser.php @@ -0,0 +1,35 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +class FrontmatterParser { + + /** + * Get [matter] and [body] from a content. + * PHP implementation of Jekyll Front Matter. + * + * $content = Entries::frontMatterParser($content); + * + * @param string $content Content to parse + * @access public + * @return array + */ + public static function parse(string $content) : array + { + $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL.ltrim($content)); + + if (count($parts) < 3) return ['matter' => [], 'body' => $content]; + + return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL.'---'.PHP_EOL, array_slice($parts, 2))]; + } +} From 415a111c4a464791a6f6807bc29af2b289507c7b Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 18:42:50 +0300 Subject: [PATCH 0067/1219] Flextype Core: Shortcodes Changes and Refactoring - Shortcodes are decoupled from Entries into separate class Shortcodes - Shortcodes initialized after Cache is proceed - Event onCurrentEntryBeforeLoaded - removed from Entries --- flextype/Entries.php | 86 +---------------------------- flextype/Flextype.php | 3 + flextype/Shortcodes.php | 119 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 84 deletions(-) create mode 100644 flextype/Shortcodes.php diff --git a/flextype/Entries.php b/flextype/Entries.php index 8427e9e5..036dc660 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -17,8 +17,6 @@ use Flextype\Component\Http\Http; use Flextype\Component\Filesystem\Filesystem; use Flextype\Component\Event\Event; use Flextype\Component\Registry\Registry; -use Thunder\Shortcode\ShortcodeFacade; -use Thunder\Shortcode\Shortcode\ShortcodeInterface; class Entries { @@ -30,14 +28,6 @@ class Entries */ private static $instance = null; - /** - * Shortcode object - * - * @var object - * @access private - */ - private static $shortcode = null; - /** * Current entry data array * @@ -96,12 +86,6 @@ class Entries // Event: The entry is not processed and not sent to the display. Event::dispatch('onCurrentEntryBeforeProcessed'); - // Init Parsers - Entries::initParsers(); - - // Event: The entry has been not loaded. - Event::dispatch('onCurrentEntryBeforeLoaded'); - // Set current requested entry data to global $entry array Entries::$entry = Entries::getEntry(Http::getUriString()); @@ -328,17 +312,6 @@ class Entries return $entry; } - /** - * Returns $shortcode object - * - * @access public - * @return object - */ - public static function shortcode() : ShortcodeFacade - { - return Entries::$shortcode; - } - /** * Process entry * @@ -369,7 +342,7 @@ class Entries $_entry = []; // Process $entry_frontmatter with YAML and Shortcodes parsers - $_entry = YamlParser::decode(Entries::processShortcodes($entry_frontmatter)); + $_entry = YamlParser::decode(Shortcodes::process($entry_frontmatter)); // Create entry url item $url = str_replace(PATH['entries'], Http::getBaseUrl(), $file_path); @@ -402,7 +375,7 @@ class Entries if ($ignore_content) { $_entry['content'] = $entry_content; } else { - $_entry['content'] = Entries::processContent($entry_content); + $_entry['content'] = Shortcodes::process($entry_content); } // Return entry @@ -410,61 +383,6 @@ class Entries } } - /** - * Process shortcodes - * - * $content = Entries::processShortcodes($content); - * - * @access public - * @param string $content Content to parse - * @return string - */ - public static function processShortcodes(string $content) : string - { - return Entries::shortcode()->process($content); - } - - /** - * Process content with markdown and shortcodes processors - * - * $content = Entries::processContent($content); - * - * @access public - * @param string $content Content to parse - * @return string - */ - public static function processContent(string $content) : string - { - return Entries::processShortcodes($content); - } - - /** - * Init Parsers - * - * @access private - * @return void - */ - private static function initParsers() : void - { - // Init Shortcodes - Entries::initShortcodes(); - } - - /** - * Init Shortcodes - * - * @access private - * @return void - */ - private static function initShortcodes() : void - { - // Create Shortcode Parser object - Entries::$shortcode = new ShortcodeFacade(); - - // Event: Shortcodes initialized and now we can add our custom shortcodes - Event::dispatch('onShortcodesInitialized'); - } - /** * Display current entry * diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 91f04317..ed86dad9 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -93,6 +93,9 @@ class Flextype // Get Cache Instance Cache::getInstance(); + // Init Shortcodes + Shortcodes::getInstance(); + // Get Images Instance Images::getInstance(); diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php new file mode 100644 index 00000000..fafa6d18 --- /dev/null +++ b/flextype/Shortcodes.php @@ -0,0 +1,119 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +use Flextype\Component\Event\Event; +use Thunder\Shortcode\ShortcodeFacade; +use Thunder\Shortcode\Shortcode\ShortcodeInterface; + +class Shortcodes { + + /** + * An instance of the Shortcodes class + * + * @var object + * @access private + */ + private static $instance = null; + + /** + * Shortcode object + * + * @var object + * @access private + */ + private static $shortcode = null; + + /** + * Private clone method to enforce singleton behavior. + * + * @access private + */ + private function __clone() + { + } + + /** + * Private wakeup method to enforce singleton behavior. + * + * @access private + */ + private function __wakeup() + { + } + + /** + * Private construct method to enforce singleton behavior. + * + * @access private + */ + private function __construct() + { + Shortcodes::init(); + } + + /** + * Init Shortcodes + * + * @access private + * @return void + */ + private static function init() : void + { + // Create Shortcode Parser object + Shortcodes::$shortcode = new ShortcodeFacade(); + + // Event: Shortcodes initialized + Event::dispatch('onShortcodesInitialized'); + } + + /** + * Returns $shortcode object + * + * @access public + * @return object + */ + public static function shortcode() : ShortcodeFacade + { + return Shortcodes::$shortcode; + } + + /** + * Process shortcodes + * + * $content = Shortcodes::proccess($content); + * + * @access public + * @param string $content Content to parse + * @return string + */ + public static function process(string $content) : string + { + return Shortcodes::shortcode()->process($content); + } + + /** + * Get the Shortcodes instance. + * + * @access public + * @return object + */ + public static function getInstance() + { + if (is_null(Shortcodes::$instance)) { + Shortcodes::$instance = new self; + } + + return Shortcodes::$instance; + } +} From dee1f0ecba19765f688ea42ac419231e8e785dea Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 18:58:44 +0300 Subject: [PATCH 0068/1219] Flextype Core: Shortcodes Changes and Refactoring - Move Snippets and Images shortcodes to Shortocodes::addDefaultShortcodes() --- flextype/Flextype.php | 3 -- flextype/Images.php | 86 ---------------------------------- flextype/Shortcodes.php | 101 ++++++++++++++++++++++++++++++++++++++++ flextype/Snippets.php | 78 ------------------------------- 4 files changed, 101 insertions(+), 167 deletions(-) diff --git a/flextype/Flextype.php b/flextype/Flextype.php index ed86dad9..c5ae892c 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -99,9 +99,6 @@ class Flextype // Get Images Instance Images::getInstance(); - // Get Snippets Instance - Snippets::getInstance(); - // Get Themes Instance Themes::getInstance(); diff --git a/flextype/Images.php b/flextype/Images.php index 3d303d4c..8f361d9b 100644 --- a/flextype/Images.php +++ b/flextype/Images.php @@ -15,92 +15,6 @@ namespace Flextype; use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; use Flextype\Component\Html\Html; -use Thunder\Shortcode\Shortcode\ShortcodeInterface; - -// Event: onShortcodesInitialized -Event::addListener('onShortcodesInitialized', function () { - - // Shortcode: [image path="home/image.jpg"] - // Result: Display image - Entries::shortcode()->addHandler('image', function(ShortcodeInterface $s) { - $params = []; - $attributes = []; - - // API - // http://glide.thephpleague.com/1.0/api/quick-reference/ - ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); - ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); - ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); - ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); - ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); - ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); - ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); - ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); - ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); - ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); - ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); - ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); - ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); - ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); - ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); - ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); - ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); - ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); - ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); - ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); - ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); - ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); - ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); - ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); - ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); - ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); - - ($s->getParameter('width')) and $attributes['width'] = $s->getParameter('width'); - ($s->getParameter('height')) and $attributes['height'] = $s->getParameter('height'); - ($s->getParameter('class')) and $attributes['class'] = $s->getParameter('class'); - ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); - ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); - - return Images::getImage($s->getParameter('path'), $params, $attributes); - }); - - // Shortcode: [image_url path="home/image.jpg"] - // Result: Display image url - Entries::shortcode()->addHandler('image_url', function(ShortcodeInterface $s) { - $params = []; - - // API - // http://glide.thephpleague.com/1.0/api/quick-reference/ - ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); - ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); - ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); - ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); - ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); - ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); - ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); - ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); - ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); - ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); - ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); - ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); - ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); - ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); - ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); - ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); - ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); - ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); - ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); - ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); - ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); - ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); - ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); - ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); - ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); - ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); - - return Images::getImageUrl($s->getParameter('path'), $params); - }); -}); class Images { diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index fafa6d18..78c50a81 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -73,6 +73,9 @@ class Shortcodes { // Create Shortcode Parser object Shortcodes::$shortcode = new ShortcodeFacade(); + // Add Default Shorcodes! + Shortcodes::addDefaultShortcodes(); + // Event: Shortcodes initialized Event::dispatch('onShortcodesInitialized'); } @@ -102,6 +105,104 @@ class Shortcodes { return Shortcodes::shortcode()->process($content); } + /** + * Add default shortcodes! + * + * @access private + * @return void + */ + private static function addDefaultShortcodes() : void + { + // Snippets + // Shortcode: [snippet name=snippet-name] + Shortcodes::shortcode()->addHandler('snippet', function(ShortcodeInterface $s) { + return Snippets::get($s->getParameter('name')); + }); + + // Images + // Shortcode: [image path="home/image.jpg"] + // Result: Display image + Shortcodes::shortcode()->addHandler('image', function(ShortcodeInterface $s) { + $params = []; + $attributes = []; + + // API + // http://glide.thephpleague.com/1.0/api/quick-reference/ + ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); + ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); + ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); + ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); + ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); + ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); + ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); + ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); + ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); + ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); + ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); + ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); + ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); + ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); + ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); + ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); + ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); + ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); + ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); + ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); + ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); + ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); + ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); + ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); + ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); + ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); + + ($s->getParameter('width')) and $attributes['width'] = $s->getParameter('width'); + ($s->getParameter('height')) and $attributes['height'] = $s->getParameter('height'); + ($s->getParameter('class')) and $attributes['class'] = $s->getParameter('class'); + ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); + ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); + + return Images::getImage($s->getParameter('path'), $params, $attributes); + }); + + // Images + // Shortcode: [image_url path="home/image.jpg"] + // Result: Display image url + Shortcodes::shortcode()->addHandler('image_url', function(ShortcodeInterface $s) { + $params = []; + + // API + // http://glide.thephpleague.com/1.0/api/quick-reference/ + ($s->getParameter('or')) and $params['or'] = $s->getParameter('or'); + ($s->getParameter('flip')) and $params['flip'] = $s->getParameter('flip'); + ($s->getParameter('crop')) and $params['crop'] = $s->getParameter('crop'); + ($s->getParameter('w')) and $params['w'] = $s->getParameter('w'); + ($s->getParameter('h')) and $params['h'] = $s->getParameter('h'); + ($s->getParameter('fit')) and $params['fit'] = $s->getParameter('fit'); + ($s->getParameter('dpr')) and $params['dpr'] = $s->getParameter('dpr'); + ($s->getParameter('bri')) and $params['bri'] = $s->getParameter('bri'); + ($s->getParameter('con')) and $params['con'] = $s->getParameter('con'); + ($s->getParameter('gam')) and $params['gam'] = $s->getParameter('gam'); + ($s->getParameter('sharp')) and $params['sharp'] = $s->getParameter('sharp'); + ($s->getParameter('blur')) and $params['blur'] = $s->getParameter('blur'); + ($s->getParameter('pixel')) and $params['pixel'] = $s->getParameter('pixel'); + ($s->getParameter('filt')) and $params['filt'] = $s->getParameter('filt'); + ($s->getParameter('mark')) and $params['mark'] = $s->getParameter('mark'); + ($s->getParameter('markw')) and $params['markw'] = $s->getParameter('markw'); + ($s->getParameter('markh')) and $params['markh'] = $s->getParameter('markh'); + ($s->getParameter('markx')) and $params['markx'] = $s->getParameter('markx'); + ($s->getParameter('marky')) and $params['marky'] = $s->getParameter('marky'); + ($s->getParameter('markpad')) and $params['markpad'] = $s->getParameter('markpad'); + ($s->getParameter('markpos')) and $params['markpos'] = $s->getParameter('markpos'); + ($s->getParameter('markalpha')) and $params['markalpha'] = $s->getParameter('markalpha'); + ($s->getParameter('bg')) and $params['bg'] = $s->getParameter('bg'); + ($s->getParameter('border')) and $params['border'] = $s->getParameter('border'); + ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); + ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); + + return Images::getImageUrl($s->getParameter('path'), $params); + }); + } + /** * Get the Shortcodes instance. * diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 6c46762b..341fa3b8 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -14,72 +14,9 @@ namespace Flextype; use Flextype\Component\Filesystem\Filesystem; use Flextype\Component\Event\Event; -use Thunder\Shortcode\Shortcode\ShortcodeInterface; - -// Event: onShortcodesInitialized -Event::addListener('onShortcodesInitialized', function () { - - // Shortcode: [snippet name=snippet-name] - Entries::shortcode()->addHandler('snippet', function(ShortcodeInterface $s) { - return Snippets::get($s->getParameter('name')); - }); -}); class Snippets { - /** - * An instance of the Snippets class - * - * @var object - */ - private static $instance = null; - - /** - * Images Server - * - * @var - */ - protected static $server; - - /** - * Private clone method to enforce singleton behavior. - * - * @access private - */ - private function __clone() - { - } - - /** - * Private wakeup method to enforce singleton behavior. - * - * @access private - */ - private function __wakeup() - { - } - - /** - * Private construct method to enforce singleton behavior. - * - * @access private - */ - private function __construct() - { - Snippets::init(); - } - - /** - * Init Snippets - * - * @access private - * @return void - */ - private static function init() : void - { - - } - /** * Get snippet * @@ -108,19 +45,4 @@ class Snippets throw new \RuntimeException("Snippet {$snippet_name} does not exist."); } } - - /** - * Get the Snippets instance. - * - * @access public - * @return object - */ - public static function getInstance() - { - if (is_null(Snippets::$instance)) { - Snippets::$instance = new self; - } - - return Snippets::$instance; - } } From 7333a925b2a315c0d5b72aa388f0721ee575fc35 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 20:04:58 +0300 Subject: [PATCH 0069/1219] Shortcodes: new default shortcode [site_url] --- flextype/Shortcodes.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 78c50a81..8092f06f 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -12,6 +12,7 @@ namespace Flextype; +use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; use Thunder\Shortcode\ShortcodeFacade; use Thunder\Shortcode\Shortcode\ShortcodeInterface; @@ -113,6 +114,11 @@ class Shortcodes { */ private static function addDefaultShortcodes() : void { + // Shortcode: [site_url] + Shortcodes::shortcode()->addHandler('site_url', function() { + return Http::getBaseUrl(); + }); + // Snippets // Shortcode: [snippet name=snippet-name] Shortcodes::shortcode()->addHandler('snippet', function(ShortcodeInterface $s) { From 757945893f6193a631c88e2d010d287d3caed070 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 20:17:55 +0300 Subject: [PATCH 0070/1219] Flextype Admin: Event onCurrentEntryBeforeLoaded - removed. --- site/plugins/admin/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index ee498af7..c61aa845 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -43,7 +43,7 @@ if (Admin::isAdminArea()) { // // Add listner for onCurrentPageBeforeLoaded event // - Event::addListener('onCurrentEntryBeforeLoaded', function () { + Event::addListener('onCurrentEntryBeforeProcessed', function () { // Add navigation links NavigationManager::addItem('content', 'entries', '' . __('admin_entries', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/entries', ['class' => 'nav-link']); From 377b93868d094afa6f0b837a2b47042f0cee3011 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 20:18:22 +0300 Subject: [PATCH 0071/1219] CHANGELOG UPDATES --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f1fe920..47b33d2b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,19 @@ ## [0.8.4] - 2019-01-xx +### Added +- Flextype Core: Shortcodes class to work with shortcodes and default shortcodes. +- Shortcodes: new default shortcode [site_url] +- Flextype Core: new method updateCurrentEntryField() - added. +- Flextype Core: new method updateCurrentEntry() - added. +- Flextype Core: Using new languages files format. + +### Changed +- Flextype Core: Flextype Components Arr updated to 1.2.5 +- Admin Panel: Settings Manager - locales list - improvements! + +### Fixed +- Admin Panel: Translates fixes. +- Flextype Core: Typo updates +- Admin Panel: Issue with js error for codemirror - fixed. ## [0.8.3] - 2019-01-16 ### Added From 6d04701573310bc5b5e6ecc1446ed827515d0164 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 21 Jan 2019 20:23:33 +0300 Subject: [PATCH 0072/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 2d79b23f..1a413ad5 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -116,7 +116,7 @@ admin_delete: "Удалить" admin_order: "Счет" admin_edit_category: "Редактировать категорию" admin_create_new_menu: "Создать новое меню" -admin_fieldsets: "Поля" +admin_fieldsets: "Наборы полей" admin_template_create_new: "Создать новый шаблон" admin_create_new_fieldset: "Создать новый набор полей" admin_duplicate: "Дублировать" From a04038074f67f8f8e6852cdf2669100cb46bd5e1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 21 Jan 2019 20:57:36 +0300 Subject: [PATCH 0073/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 1a413ad5..b640e077 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -164,7 +164,7 @@ admin_quality: "Качество" admin_width: "Ширина" admin_height: "Высота" admin_accept_file_types: "Допустимые типы файлов" -admin_embeded_code: "Встроенный код" +admin_embeded_code: "Код для вставки" admin_shortcode: "Короткий код" admin_php_code: "PHP код" admin_choose_files_to_upload: "Выберите файл" From 1794b855851d42895edf64eaf0594f7331f12fa4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 21 Jan 2019 21:23:50 +0300 Subject: [PATCH 0074/1219] Flextype Core: Plugins fix locales --- flextype/Plugins.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 106880fb..04c2c64f 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -34,9 +34,11 @@ class Plugins */ private static $locales = [ 'af' => [ 'name' => 'Afrikaans', 'nativeName' => 'Afrikaans' ], + 'af_ZA' => [ 'name' => 'Afrikaans', 'nativeName' => 'Afrikaans' ], 'ak' => [ 'name' => 'Akan', 'nativeName' => 'Akan' ], // unverified native name 'ast' => [ 'name' => 'Asturian', 'nativeName' => 'Asturianu' ], 'ar' => [ 'name' => 'Arabic', 'nativeName' => 'عربي', 'orientation' => 'rtl'], + 'ar_SA' => [ 'name' => 'Arabic', 'nativeName' => 'عربي', 'orientation' => 'rtl'], 'as' => [ 'name' => 'Assamese', 'nativeName' => 'অসমীয়া' ], 'be' => [ 'name' => 'Belarusian', 'nativeName' => 'Беларуская' ], 'bg' => [ 'name' => 'Bulgarian', 'nativeName' => 'Български' ], @@ -46,16 +48,20 @@ class Plugins 'br' => [ 'name' => 'Breton', 'nativeName' => 'Brezhoneg' ], 'bs' => [ 'name' => 'Bosnian', 'nativeName' => 'Bosanski' ], 'ca' => [ 'name' => 'Catalan', 'nativeName' => 'Català' ], + 'ca_ES' => [ 'name' => 'Catalan', 'nativeName' => 'Català' ], 'ca_valencia'=> [ 'name' => 'Catalan (Valencian)', 'nativeName' => 'Català (valencià)' ], // not iso-639-1. a=l10n-drivers 'cs' => [ 'name' => 'Czech', 'nativeName' => 'Čeština' ], + 'cs_CZ' => [ 'name' => 'Czech', 'nativeName' => 'Čeština' ], 'cy' => [ 'name' => 'Welsh', 'nativeName' => 'Cymraeg' ], 'da' => [ 'name' => 'Danish', 'nativeName' => 'Dansk' ], + 'da_DK' => [ 'name' => 'Danish', 'nativeName' => 'Dansk' ], 'de' => [ 'name' => 'German', 'nativeName' => 'Deutsch' ], 'de_AT' => [ 'name' => 'German (Austria)', 'nativeName' => 'Deutsch (Österreich)' ], 'de_CH' => [ 'name' => 'German (Switzerland)', 'nativeName' => 'Deutsch (Schweiz)' ], 'de_DE' => [ 'name' => 'German (Germany)', 'nativeName' => 'Deutsch (Deutschland)' ], 'dsb' => [ 'name' => 'Lower Sorbian', 'nativeName' => 'Dolnoserbšćina' ], // iso-639-2 'el' => [ 'name' => 'Greek', 'nativeName' => 'Ελληνικά' ], + 'el_GR' => [ 'name' => 'Greek', 'nativeName' => 'Ελληνικά' ], 'en' => [ 'name' => 'English', 'nativeName' => 'English' ], 'en_AU' => [ 'name' => 'English (Australian)', 'nativeName' => 'English (Australian)' ], 'en_CA' => [ 'name' => 'English (Canadian)', 'nativeName' => 'English (Canadian)' ], @@ -73,6 +79,7 @@ class Plugins 'eu' => [ 'name' => 'Basque', 'nativeName' => 'Euskara' ], 'fa' => [ 'name' => 'Persian', 'nativeName' => 'فارسی' , 'orientation' => 'rtl' ], 'fi' => [ 'name' => 'Finnish', 'nativeName' => 'Suomi' ], + 'fi_FI' => [ 'name' => 'Finnish', 'nativeName' => 'Suomi' ], 'fj_FJ' => [ 'name' => 'Fijian', 'nativeName' => 'Vosa vaka_Viti' ], 'fr' => [ 'name' => 'French', 'nativeName' => 'Français' ], 'fr_CA' => [ 'name' => 'French (Canada)', 'nativeName' => 'Français (Canada)' ], @@ -88,22 +95,27 @@ class Plugins 'gu' => [ 'name' => 'Gujarati', 'nativeName' => 'ગુજરાતી' ], 'gu_IN' => [ 'name' => 'Gujarati', 'nativeName' => 'ગુજરાતી' ], 'he' => [ 'name' => 'Hebrew', 'nativeName' => 'עברית', 'orientation' => 'rtl' ], + 'he_IL' => [ 'name' => 'Hebrew', 'nativeName' => 'עברית', 'orientation' => 'rtl' ], 'hi' => [ 'name' => 'Hindi', 'nativeName' => 'हिन्दी' ], 'hi_IN' => [ 'name' => 'Hindi (India)', 'nativeName' => 'हिन्दी (भारत)' ], 'hr' => [ 'name' => 'Croatian', 'nativeName' => 'Hrvatski' ], + 'hr_HR' => [ 'name' => 'Croatian', 'nativeName' => 'Hrvatski' ], 'hsb' => [ 'name' => 'Upper Sorbian', 'nativeName' => 'Hornjoserbsce' ], 'hu' => [ 'name' => 'Hungarian', 'nativeName' => 'Magyar' ], + 'hu_HU' => [ 'name' => 'Hungarian', 'nativeName' => 'Magyar' ], 'hy' => [ 'name' => 'Armenian', 'nativeName' => 'Հայերեն' ], 'hy_AM' => [ 'name' => 'Armenian', 'nativeName' => 'Հայերեն' ], 'id' => [ 'name' => 'Indonesian', 'nativeName' => 'Bahasa Indonesia' ], 'is' => [ 'name' => 'Icelandic', 'nativeName' => 'íslenska' ], 'it' => [ 'name' => 'Italian', 'nativeName' => 'Italiano' ], + 'it_IT' => [ 'name' => 'Italian', 'nativeName' => 'Italiano' ], 'ja' => [ 'name' => 'Japanese', 'nativeName' => '日本語' ], 'ja_JP' => [ 'name' => 'Japanese', 'nativeName' => '日本語' ], // not iso-639-1 'ka' => [ 'name' => 'Georgian', 'nativeName' => 'ქართული' ], 'kk' => [ 'name' => 'Kazakh', 'nativeName' => 'Қазақ' ], 'kn' => [ 'name' => 'Kannada', 'nativeName' => 'ಕನ್ನಡ' ], 'ko' => [ 'name' => 'Korean', 'nativeName' => '한국어' ], + 'ko_KR' => [ 'name' => 'Korean', 'nativeName' => '한국어' ], 'ku' => [ 'name' => 'Kurdish', 'nativeName' => 'Kurdî' ], 'la' => [ 'name' => 'Latin', 'nativeName' => 'Latina' ], 'lb' => [ 'name' => 'Luxembourgish', 'nativeName' => 'Lëtzebuergesch' ], @@ -118,11 +130,13 @@ class Plugins 'mn' => [ 'name' => 'Mongolian', 'nativeName' => 'Монгол' ], 'mr' => [ 'name' => 'Marathi', 'nativeName' => 'मराठी' ], 'no' => [ 'name' => 'Norwegian', 'nativeName' => 'Norsk' ], + 'no_NO' => [ 'name' => 'Norwegian', 'nativeName' => 'Norsk' ], 'nb' => [ 'name' => 'Norwegian', 'nativeName' => 'Norsk' ], 'nb_NO' => [ 'name' => 'Norwegian (Bokmål)', 'nativeName' => 'Norsk bokmål' ], 'ne_NP' => [ 'name' => 'Nepali', 'nativeName' => 'नेपाली' ], 'nn_NO' => [ 'name' => 'Norwegian (Nynorsk)', 'nativeName' => 'Norsk nynorsk' ], 'nl' => [ 'name' => 'Dutch', 'nativeName' => 'Nederlands' ], + 'nl_NL' => [ 'name' => 'Dutch', 'nativeName' => 'Nederlands' ], 'nr' => [ 'name' => 'Ndebele, South', 'nativeName' => 'IsiNdebele' ], 'nso' => [ 'name' => 'Northern Sotho', 'nativeName' => 'Sepedi' ], 'oc' => [ 'name' => 'Occitan (Lengadocian)', 'nativeName' => 'Occitan (lengadocian)' ], @@ -130,12 +144,15 @@ class Plugins 'pa' => [ 'name' => 'Punjabi', 'nativeName' => 'ਪੰਜਾਬੀ' ], 'pa_IN' => [ 'name' => 'Punjabi', 'nativeName' => 'ਪੰਜਾਬੀ' ], 'pl' => [ 'name' => 'Polish', 'nativeName' => 'Polski' ], + 'pl_PL' => [ 'name' => 'Polish', 'nativeName' => 'Polski' ], 'pt' => [ 'name' => 'Portuguese', 'nativeName' => 'Português' ], 'pt_BR' => [ 'name' => 'Portuguese (Brazilian)', 'nativeName' => 'Português (do Brasil)' ], 'pt_PT' => [ 'name' => 'Portuguese (Portugal)', 'nativeName' => 'Português (Europeu)' ], 'ro' => [ 'name' => 'Romanian', 'nativeName' => 'Română' ], + 'ro_RO' => [ 'name' => 'Romanian', 'nativeName' => 'Română' ], 'rm' => [ 'name' => 'Romansh', 'nativeName' => 'Rumantsch' ], 'ru' => [ 'name' => 'Russian', 'nativeName' => 'Русский' ], + 'ru_RU' => [ 'name' => 'Russian', 'nativeName' => 'Русский' ], 'rw' => [ 'name' => 'Kinyarwanda', 'nativeName' => 'Ikinyarwanda' ], 'si' => [ 'name' => 'Sinhala', 'nativeName' => 'සිංහල' ], 'sk' => [ 'name' => 'Slovak', 'nativeName' => 'Slovenčina' ], @@ -143,6 +160,7 @@ class Plugins 'son' => [ 'name' => 'Songhai', 'nativeName' => 'Soŋay' ], 'sq' => [ 'name' => 'Albanian', 'nativeName' => 'Shqip' ], 'sr' => [ 'name' => 'Serbian', 'nativeName' => 'Српски' ], + 'sr_SP' => [ 'name' => 'Serbian', 'nativeName' => 'Српски' ], 'sr_Latn' => [ 'name' => 'Serbian', 'nativeName' => 'Srpski' ], // follows RFC 4646 'ss' => [ 'name' => 'Siswati', 'nativeName' => 'siSwati' ], 'st' => [ 'name' => 'Southern Sotho', 'nativeName' => 'Sesotho' ], @@ -156,13 +174,16 @@ class Plugins 'tlh' => [ 'name' => 'Klingon', 'nativeName' => 'Klingon' ], 'tn' => [ 'name' => 'Tswana', 'nativeName' => 'Setswana' ], 'tr' => [ 'name' => 'Turkish', 'nativeName' => 'Türkçe' ], + 'tr_TR' => [ 'name' => 'Turkish', 'nativeName' => 'Türkçe' ], 'ts' => [ 'name' => 'Tsonga', 'nativeName' => 'Xitsonga' ], 'tt' => [ 'name' => 'Tatar', 'nativeName' => 'Tatarça' ], 'tt_RU' => [ 'name' => 'Tatar', 'nativeName' => 'Tatarça' ], 'uk' => [ 'name' => 'Ukrainian', 'nativeName' => 'Українська' ], + 'uk_UA' => [ 'name' => 'Ukrainian', 'nativeName' => 'Українська' ], 'ur' => [ 'name' => 'Urdu', 'nativeName' => 'اُردو', 'orientation' => 'rtl' ], 've' => [ 'name' => 'Venda', 'nativeName' => 'Tshivenḓa' ], 'vi' => [ 'name' => 'Vietnamese', 'nativeName' => 'Tiếng Việt' ], + 'vi_VN' => [ 'name' => 'Vietnamese', 'nativeName' => 'Tiếng Việt' ], 'wo' => [ 'name' => 'Wolof', 'nativeName' => 'Wolof' ], 'xh' => [ 'name' => 'Xhosa', 'nativeName' => 'isiXhosa' ], 'zh' => [ 'name' => 'Chinese (Simplified)', 'nativeName' => '中文 (简体)' ], From b6ac37ec3451e89d620d185cd4f5d318ff30991d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 26 Jan 2019 01:52:55 +0300 Subject: [PATCH 0075/1219] Admin Panel: translates fixes --- site/plugins/admin/views/templates/content/entries/add.php | 4 ++-- site/plugins/admin/views/templates/content/entries/rename.php | 2 +- site/plugins/admin/views/templates/extends/fieldsets/add.php | 4 ++-- .../admin/views/templates/extends/fieldsets/rename.php | 2 +- site/plugins/admin/views/templates/extends/menus/add.php | 4 ++-- site/plugins/admin/views/templates/extends/menus/rename.php | 2 +- .../plugins/admin/views/templates/extends/snippets/rename.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php index 59f31cbc..695de4da 100644 --- a/site/plugins/admin/views/templates/content/entries/add.php +++ b/site/plugins/admin/views/templates/content/entries/add.php @@ -33,11 +33,11 @@ Themes::view('admin/views/partials/content-start')->display();
'entryTitle']) ?> - 'form-control', 'id' => 'entryTitle', 'required', 'data-validation' => 'length required', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_title_empty_input')]) ?> + 'form-control', 'id' => 'entryTitle', 'required', 'data-validation' => 'length required', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'entrySlug']) ?> - 'form-control', 'id' => 'entrySlug', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_name_empty_input')]) ?> + 'form-control', 'id' => 'entrySlug', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?>
diff --git a/site/plugins/admin/views/templates/content/entries/rename.php b/site/plugins/admin/views/templates/content/entries/rename.php index 0f60ac64..71fd2524 100644 --- a/site/plugins/admin/views/templates/content/entries/rename.php +++ b/site/plugins/admin/views/templates/content/entries/rename.php @@ -35,7 +35,7 @@ Themes::view('admin/views/partials/content-start')->display();
'entryName']) ?> - 'form-control', 'id' => 'entryName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_title_empty_input')]) ?> + 'form-control', 'id' => 'entryName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/extends/fieldsets/add.php b/site/plugins/admin/views/templates/extends/fieldsets/add.php index 77a42369..a052959a 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/add.php +++ b/site/plugins/admin/views/templates/extends/fieldsets/add.php @@ -32,11 +32,11 @@ Themes::view('admin/views/partials/content-start')->display();
'fieldsetTitle']) ?> - 'form-control', 'id' => 'fieldsetTitle', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_fieldsets_error_name_empty_input')]) ?> + 'form-control', 'id' => 'fieldsetTitle', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'fieldsetName']) ?> - 'form-control', 'id' => 'fieldsetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_fieldsets_error_name_empty_input')]) ?> + 'form-control', 'id' => 'fieldsetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?>
diff --git a/site/plugins/admin/views/templates/extends/fieldsets/rename.php b/site/plugins/admin/views/templates/extends/fieldsets/rename.php index d5c83e3f..33a18b20 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/rename.php +++ b/site/plugins/admin/views/templates/extends/fieldsets/rename.php @@ -33,7 +33,7 @@ Themes::view('admin/views/partials/content-start')->display();
'fieldsetName']) ?> - 'form-control', 'id' => 'fieldsetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_fieldset_error_title_empty_input')]) ?> + 'form-control', 'id' => 'fieldsetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/extends/menus/add.php b/site/plugins/admin/views/templates/extends/menus/add.php index 8cac6e72..2915cb0a 100644 --- a/site/plugins/admin/views/templates/extends/menus/add.php +++ b/site/plugins/admin/views/templates/extends/menus/add.php @@ -32,11 +32,11 @@ Themes::view('admin/views/partials/content-start')->display();
'menuTitle']) ?> - 'form-control', 'id' => 'menuTitle', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_menus_error_name_empty_input')]) ?> + 'form-control', 'id' => 'menuTitle', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'menuName']) ?> - 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_menus_error_name_empty_input')]) ?> + 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?>
diff --git a/site/plugins/admin/views/templates/extends/menus/rename.php b/site/plugins/admin/views/templates/extends/menus/rename.php index af8c16f5..26540a4c 100644 --- a/site/plugins/admin/views/templates/extends/menus/rename.php +++ b/site/plugins/admin/views/templates/extends/menus/rename.php @@ -33,7 +33,7 @@ Themes::view('admin/views/partials/content-start')->display();
'menuName']) ?> - 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_menu_error_title_empty_input')]) ?> + 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/rename.php b/site/plugins/admin/views/templates/extends/snippets/rename.php index fe5ad566..c4639e57 100644 --- a/site/plugins/admin/views/templates/extends/snippets/rename.php +++ b/site/plugins/admin/views/templates/extends/snippets/rename.php @@ -33,7 +33,7 @@ Themes::view('admin/views/partials/content-start')->display();
'snippetName']) ?> - 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_snippet_error_title_empty_input')]) ?> + 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> From a57f2cdaf2eafa8aed23a89724fb519f2764dc4d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 26 Jan 2019 02:01:35 +0300 Subject: [PATCH 0076/1219] Admin Panel: translates fixes --- site/plugins/admin/views/templates/extends/snippets/add.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/snippets/add.php b/site/plugins/admin/views/templates/extends/snippets/add.php index c983431c..b3051928 100644 --- a/site/plugins/admin/views/templates/extends/snippets/add.php +++ b/site/plugins/admin/views/templates/extends/snippets/add.php @@ -32,7 +32,7 @@ Themes::view('admin/views/partials/content-start')->display();
'snippetName']) ?> - 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_snippets_error_name_empty_input')]) ?> + 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?>
From cfe3bd5bcdf770e58ae070572864f87039b4bb6e Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 26 Jan 2019 02:34:50 +0300 Subject: [PATCH 0077/1219] Flextype Core: Themes - getFieldsets() added ablity to ignore fieldsets with empty fields --- flextype/Themes.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index 178ede05..cf54899b 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -172,9 +172,10 @@ class Themes * Get Fieldsets for current theme * * @access public + * @param array $ignore_empty_fieldsets Ignore fieldsets with empty fields, by default is true * @return array */ - public static function getFieldsets() : array + public static function getFieldsets(bool $ignore_empty_fieldsets = true) : array { $fieldsets = []; @@ -187,7 +188,13 @@ class Themes if (!is_bool(Themes::_strrevpos($fieldset, '/fieldsets/'))) { $fieldset_name = str_replace('.yaml', '', substr($fieldset, Themes::_strrevpos($fieldset, '/fieldsets/')+strlen('/fieldsets/'))); $fieldset = YamlParser::decode(Filesystem::getFileContent($fieldset)); - $fieldsets[$fieldset_name] = $fieldset['title']; + if ($ignore_empty_fieldsets) { + $fieldsets[$fieldset_name] = $fieldset['title']; + } else { + if (isset($fieldset['fields']) && count($fieldset['fields']) > 0) { + $fieldsets[$fieldset_name] = $fieldset['title']; + } + } } } } From a05ba4067dc1daf9d558266f586221d5b38c8527 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 26 Jan 2019 02:35:37 +0300 Subject: [PATCH 0078/1219] Admin Panel: Entries Manager - added ability to ignore fieldsets with empty fields --- site/plugins/admin/classes/EntriesManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 529fa0b3..727394a1 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -97,7 +97,7 @@ class EntriesManager } Themes::view('admin/views/templates/content/entries/add') - ->assign('fieldsets', Themes::getFieldsets()) + ->assign('fieldsets', Themes::getFieldsets(false)) ->assign('entries_list', Entries::getEntries('', 'slug')) ->display(); break; From cf63aebde1085d2e147eca1a8a9c16fec1ae85e2 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 26 Jan 2019 02:40:11 +0300 Subject: [PATCH 0079/1219] Admin Panel: tail - fixes --- site/plugins/admin/views/partials/tail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index d07d0728..4279ebce 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -134,7 +134,7 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets $.validate({}); - + var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), { lineNumbers: true, From 72616f48282f5384bfc4f9b06d7881dc9ae6376b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 27 Jan 2019 23:52:45 +0300 Subject: [PATCH 0080/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 374ecc75..c9c2220e 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -7,8 +7,8 @@ admin_email: "Email" admin_flextype_version: "Flextype Version" admin_information: "Information" admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" +admin_keywords: "Anahtar Kelimeler" +admin_login: "Giriş Yap" admin_entries: "Entries" admin_extends: "Extends" admin_plugins: "Plugins" @@ -22,37 +22,37 @@ admin_snippets: "Snippets" admin_not_installed: "Not Installed" admin_off: "Off" admin_on: "On" -admin_add: "Add" +admin_add: "Ekle" admin_entry_attributes: "Entry Attributes" admin_fieldset_for_template: "Fieldset for template" -admin_content: "Content" +admin_content: "İçerik" admin_create_new_entry: "Create New Entry" admin_date: "Date" -admin_draft: "Draft" +admin_draft: "Taslak" admin_edit: "Edit" admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" -admin_settings: "Settings" +admin_settings: "Ayarlar" admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" -admin_source: "Source" +admin_source: "Kaynak" admin_files: "Files" admin_upload: "Upload" -admin_hidden: "Hidden" +admin_hidden: "Gizli" admin_image_preview: "Image preview" -admin_move: "Move" +admin_move: "Taşı" admin_parent_entry: "Entry parent" admin_preview: "Preview" admin_publish: "Publish" -admin_rename: "Rename" +admin_rename: "Yeniden Adlandır" admin_save_entry: "Save entry" admin_template: "Template" admin_title: "Title" admin_url: "Url" admin_view: "View" -admin_visibility: "Visibility" +admin_visibility: "Görünürlük" admin_visible: "Visible" admin_password: "Password" admin_php_built_on: "PHP Built On" From a78e993a6b322f2be1c33afd20ed919a4d867055 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 00:03:15 +0300 Subject: [PATCH 0081/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index c9c2220e..f74c823b 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -3,7 +3,7 @@ admin: "Admin" admin_cancel: "Cancel" admin_create: "Create" admin_debugging: "Debugging" -admin_email: "Email" +admin_email: "E-posta" admin_flextype_version: "Flextype Version" admin_information: "Information" admin_installed: "Installed" @@ -11,8 +11,8 @@ admin_keywords: "Anahtar Kelimeler" admin_login: "Giriş Yap" admin_entries: "Entries" admin_extends: "Extends" -admin_plugins: "Plugins" -admin_themes: "Themes" +admin_plugins: "Eklentiler" +admin_themes: "Temalar" admin_help: "Help" admin_getting_help: "Getting Help" admin_logout: "Logout" @@ -20,17 +20,17 @@ admin_profile: "Profile" admin_view_site: "View Site" admin_snippets: "Snippets" admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" +admin_off: "Kapalı" +admin_on: "Açık" admin_add: "Ekle" admin_entry_attributes: "Entry Attributes" admin_fieldset_for_template: "Fieldset for template" admin_content: "İçerik" admin_create_new_entry: "Create New Entry" -admin_date: "Date" +admin_date: "Tarih" admin_draft: "Taslak" admin_edit: "Edit" -admin_menus: "Menus" +admin_menus: "Menüler" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Ayarlar" @@ -39,13 +39,13 @@ admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Kaynak" admin_files: "Files" -admin_upload: "Upload" +admin_upload: "Yükle" admin_hidden: "Gizli" admin_image_preview: "Image preview" admin_move: "Taşı" admin_parent_entry: "Entry parent" admin_preview: "Preview" -admin_publish: "Publish" +admin_publish: "Yayınla" admin_rename: "Yeniden Adlandır" admin_save_entry: "Save entry" admin_template: "Template" @@ -56,13 +56,13 @@ admin_visibility: "Görünürlük" admin_visible: "Visible" admin_password: "Password" admin_php_built_on: "PHP Built On" -admin_php_version: "PHP Version" +admin_php_version: "PHP Versiyon" admin_author_url: "Author url" -admin_bugs: "Bugs" +admin_bugs: "Hatalar" admin_description: "Description" admin_get_more_plugins: "Get More Plugins" admin_homepage: "Homepage" -admin_info: "Info" +admin_info: "Bilgi" admin_license: "License" admin_status: "Status" admin_disabled: "disabled" @@ -112,7 +112,7 @@ admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" -admin_delete: "Delete" +admin_delete: "Sil" admin_order: "Order" admin_edit_category: "Edit category" admin_create_new_menu: "Create New Menu" From b1ec4144b41f8151a31368e1b0f8eda16fd8c5e6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 00:13:02 +0300 Subject: [PATCH 0082/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index f74c823b..0140b879 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -49,12 +49,12 @@ admin_publish: "Yayınla" admin_rename: "Yeniden Adlandır" admin_save_entry: "Save entry" admin_template: "Template" -admin_title: "Title" +admin_title: "Başlık" admin_url: "Url" admin_view: "View" admin_visibility: "Görünürlük" admin_visible: "Visible" -admin_password: "Password" +admin_password: "Şifre" admin_php_built_on: "PHP Built On" admin_php_version: "PHP Versiyon" admin_author_url: "Author url" @@ -67,7 +67,7 @@ admin_license: "License" admin_status: "Status" admin_disabled: "disabled" admin_enabled: "enabled" -admin_version: "Version" +admin_version: "Sürüm" admin_role: "Role" admin_save: "Save" admin_security_check_results: "Security check results" From f3a1c20a378ba767ec384dbc1cb971344c30ac45 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 00:33:09 +0300 Subject: [PATCH 0083/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 0140b879..682a91ba 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -44,32 +44,32 @@ admin_hidden: "Gizli" admin_image_preview: "Image preview" admin_move: "Taşı" admin_parent_entry: "Entry parent" -admin_preview: "Preview" +admin_preview: "Önizleme" admin_publish: "Yayınla" admin_rename: "Yeniden Adlandır" admin_save_entry: "Save entry" -admin_template: "Template" +admin_template: "Şablon" admin_title: "Başlık" admin_url: "Url" -admin_view: "View" +admin_view: "Görüntüle" admin_visibility: "Görünürlük" -admin_visible: "Visible" +admin_visible: "Görünürlük" admin_password: "Şifre" admin_php_built_on: "PHP Built On" admin_php_version: "PHP Versiyon" -admin_author_url: "Author url" +admin_author_url: "Yazar url" admin_bugs: "Hatalar" -admin_description: "Description" +admin_description: "Açıklama" admin_get_more_plugins: "Get More Plugins" admin_homepage: "Homepage" admin_info: "Bilgi" -admin_license: "License" -admin_status: "Status" -admin_disabled: "disabled" -admin_enabled: "enabled" +admin_license: "Lisans" +admin_status: "Durum" +admin_disabled: "devre dışı" +admin_enabled: "etkin" admin_version: "Sürüm" -admin_role: "Role" -admin_save: "Save" +admin_role: "Rol" +admin_save: "Kaydet" admin_security_check_results: "Security check results" admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" @@ -81,10 +81,10 @@ admin_error404_title: "Error404 entry title" admin_error404_description: "Error404 entry description" admin_error404_content: "Error404 entry content" admin_error404_template: "Error404 entry template" -admin_heading: "Settings" +admin_heading: "Ayarlar" admin_general: "General" admin_error_404_page: "Error 404 page" -admin_cache: "Cache" +admin_cache: "Önbellek" admin_author_email: "Author email" admin_author_name: "Author name" admin_site_description: "Site description" From 9a8040b6de62f1e00175cc48fd2a2e088d98db1a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 00:43:00 +0300 Subject: [PATCH 0084/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 682a91ba..13202128 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -1,25 +1,25 @@ --- -admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" +admin: "Yönetici" +admin_cancel: "İptal" +admin_create: "Oluştur" admin_debugging: "Debugging" admin_email: "E-posta" -admin_flextype_version: "Flextype Version" -admin_information: "Information" -admin_installed: "Installed" +admin_flextype_version: "Flextype Sürüm" +admin_information: "Bilgi" +admin_installed: "Yüklendi" admin_keywords: "Anahtar Kelimeler" admin_login: "Giriş Yap" admin_entries: "Entries" admin_extends: "Extends" admin_plugins: "Eklentiler" admin_themes: "Temalar" -admin_help: "Help" -admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" +admin_help: "Yardım et" +admin_getting_help: "Yardım Alma" +admin_logout: "Çıkış Yap" +admin_profile: "Profil" +admin_view_site: "Siteyi Görüntüle" admin_snippets: "Snippets" -admin_not_installed: "Not Installed" +admin_not_installed: "Yüklenmedi" admin_off: "Kapalı" admin_on: "Açık" admin_add: "Ekle" @@ -29,19 +29,19 @@ admin_content: "İçerik" admin_create_new_entry: "Create New Entry" admin_date: "Tarih" admin_draft: "Taslak" -admin_edit: "Edit" +admin_edit: "Düzenle" admin_menus: "Menüler" admin_blocks: "Blocks" -admin_media: "Media" +admin_media: "Medya" admin_settings: "Ayarlar" -admin_templates: "Templates" +admin_templates: "Şablonlar" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Kaynak" -admin_files: "Files" +admin_files: "Dosyalar" admin_upload: "Yükle" admin_hidden: "Gizli" -admin_image_preview: "Image preview" +admin_image_preview: "Resim önizleme" admin_move: "Taşı" admin_parent_entry: "Entry parent" admin_preview: "Önizleme" @@ -74,7 +74,7 @@ admin_security_check_results: "Security check results" admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_server: "Server" +admin_server: "Sunucu" admin_site: "Site" admin_clear_cache: "Clear cache" admin_error404_title: "Error404 entry title" @@ -82,16 +82,16 @@ admin_error404_description: "Error404 entry description" admin_error404_content: "Error404 entry content" admin_error404_template: "Error404 entry template" admin_heading: "Ayarlar" -admin_general: "General" +admin_general: "Genel" admin_error_404_page: "Error 404 page" admin_cache: "Önbellek" -admin_author_email: "Author email" -admin_author_name: "Author name" -admin_site_description: "Site description" +admin_author_email: "Yazar e-posta" +admin_author_name: "Yazar adı" +admin_site_description: "Site açıklaması" admin_site_keywords: "Site keywords" admin_site_robots: "Robots" -admin_site_title: "Site title" -admin_system: "System" +admin_site_title: "Site Başlığı" +admin_system: "Sistem" admin_cache_driver: "Cache driver" admin_cache_enabled: "Cache enabled" admin_cache_lifetime: "Cache lifetime" @@ -99,25 +99,25 @@ admin_cache_prefix: "Cache prefix" admin_charset: "Charset" admin_date_format: "Date format" admin_errors_display: "Display errors" -admin_locale: "Locale" +admin_locale: "Yerel" admin_entry_main: "Main entry" -admin_theme: "Theme" -admin_timezone: "Timezone" +admin_theme: "Tema" +admin_timezone: "Zaman Dilimi" admin_username: "Username" -admin_create_user: "Create User" +admin_create_user: "Kullanıcı Oluştur" admin_create_new_user: "Create New User" -admin_web_server: "Web Server" +admin_web_server: "Web Sunucu" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" +admin_menu: "Menü" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Sil" admin_order: "Order" -admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" +admin_edit_category: "Kategoriyi düzenle" +admin_create_new_menu: "Yeni Menu Oluştur" admin_fieldsets: "Fieldsets" -admin_template_create_new: "Create New Template" +admin_template_create_new: "Yeni Şablon Oluştur" admin_create_new_fieldset: "Create New Fieldset" admin_duplicate: "Duplicate" admin_summary: "Summary" @@ -168,11 +168,11 @@ admin_embeded_code: "Embeded Code" admin_shortcode: "Shortcode" admin_php_code: "PHP Code" admin_choose_files_to_upload: "Choose file" -admin_browse_files: "Browse" +admin_browse_files: "Gözat" admin_copy: "Copy" -admin_admin_panel: "Admin Panel" -admin_light: "Light" -admin_dark: "Dark" +admin_admin_panel: "Yönetim Paneli" +admin_light: "Aydınlık" +admin_dark: "Karanlık" admin_name: "Name" admin_memcache_server: "Memcache Server" admin_memcache_port: "Memcache Port" From b5a6a07021f4d09128342e6e5ec120bef6ee1e68 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 01:05:07 +0300 Subject: [PATCH 0085/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 13202128..4b892925 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -2,7 +2,7 @@ admin: "Yönetici" admin_cancel: "İptal" admin_create: "Oluştur" -admin_debugging: "Debugging" +admin_debugging: "Hata ayıklama" admin_email: "E-posta" admin_flextype_version: "Flextype Sürüm" admin_information: "Bilgi" @@ -31,7 +31,7 @@ admin_date: "Tarih" admin_draft: "Taslak" admin_edit: "Düzenle" admin_menus: "Menüler" -admin_blocks: "Blocks" +admin_blocks: "Bloklar" admin_media: "Medya" admin_settings: "Ayarlar" admin_templates: "Şablonlar" @@ -60,8 +60,8 @@ admin_php_version: "PHP Versiyon" admin_author_url: "Yazar url" admin_bugs: "Hatalar" admin_description: "Açıklama" -admin_get_more_plugins: "Get More Plugins" -admin_homepage: "Homepage" +admin_get_more_plugins: "Daha Fazla Eklenti" +admin_homepage: "Anasayfa" admin_info: "Bilgi" admin_license: "Lisans" admin_status: "Durum" @@ -83,52 +83,52 @@ admin_error404_content: "Error404 entry content" admin_error404_template: "Error404 entry template" admin_heading: "Ayarlar" admin_general: "Genel" -admin_error_404_page: "Error 404 page" +admin_error_404_page: "Hata 404 sayfası" admin_cache: "Önbellek" admin_author_email: "Yazar e-posta" admin_author_name: "Yazar adı" admin_site_description: "Site açıklaması" -admin_site_keywords: "Site keywords" +admin_site_keywords: "Site Anahtar Kelimeler" admin_site_robots: "Robots" admin_site_title: "Site Başlığı" admin_system: "Sistem" -admin_cache_driver: "Cache driver" +admin_cache_driver: "Önbellek sürücüsü" admin_cache_enabled: "Cache enabled" admin_cache_lifetime: "Cache lifetime" admin_cache_prefix: "Cache prefix" admin_charset: "Charset" -admin_date_format: "Date format" +admin_date_format: "Tarih formatı" admin_errors_display: "Display errors" admin_locale: "Yerel" admin_entry_main: "Main entry" admin_theme: "Tema" admin_timezone: "Zaman Dilimi" -admin_username: "Username" +admin_username: "Kullanıcı Adı" admin_create_user: "Kullanıcı Oluştur" admin_create_new_user: "Create New User" admin_web_server: "Web Sunucu" admin_web_server_php_interface: "WebServer to PHP Interface" admin_menu: "Menü" admin_create_new_category: "Create New Category" -admin_delete_category: "Delete Category" +admin_delete_category: "Kategori Sil" admin_create_new_item: "Create New Item" admin_delete: "Sil" -admin_order: "Order" +admin_order: "Sıra" admin_edit_category: "Kategoriyi düzenle" admin_create_new_menu: "Yeni Menu Oluştur" admin_fieldsets: "Fieldsets" admin_template_create_new: "Yeni Şablon Oluştur" admin_create_new_fieldset: "Create New Fieldset" -admin_duplicate: "Duplicate" +admin_duplicate: "Kopyala" admin_summary: "Summary" admin_snippet: "Snippet" admin_type: "Type" admin_partial: "Partial" -admin_clone: "Clone" +admin_clone: "Klonla" admin_create_new_snippet: "Create New Snippet" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" -admin_message_template_deleted: "Template deleted" +admin_message_template_deleted: "Şablon silindi" admin_message_template_renamed: "Template renamed" admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" @@ -161,19 +161,19 @@ admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" -admin_width: "Width" -admin_height: "Height" +admin_width: "Genişlik" +admin_height: "Yükseklik" admin_accept_file_types: "Accept file types" admin_embeded_code: "Embeded Code" admin_shortcode: "Shortcode" admin_php_code: "PHP Code" -admin_choose_files_to_upload: "Choose file" +admin_choose_files_to_upload: "Dosya seç" admin_browse_files: "Gözat" -admin_copy: "Copy" +admin_copy: "Kopyala" admin_admin_panel: "Yönetim Paneli" admin_light: "Aydınlık" admin_dark: "Karanlık" -admin_name: "Name" +admin_name: "Ad" admin_memcache_server: "Memcache Server" admin_memcache_port: "Memcache Port" admin_memcached_server: "Memcached Server" From 784edac89b56f03e788e576905a07cc1cf7ed9e1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 10:32:45 +0300 Subject: [PATCH 0086/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 96 ++++++++++++------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 04921cf2..2c2b29f5 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -1,55 +1,55 @@ --- admin: "Адмін" -admin_cancel: "Cancel" +admin_cancel: "Скасувати" admin_create: "Create" admin_debugging: "Debugging" -admin_email: "Email" -admin_flextype_version: "Flextype Version" -admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" +admin_email: "E-mail" +admin_flextype_version: "Версія Flextype" +admin_information: "Інформація" +admin_installed: "Встановлений" +admin_keywords: "Ключові Слова" +admin_login: "Логін" admin_entries: "Entries" admin_extends: "Extends" -admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Help" +admin_plugins: "Плагіни" +admin_themes: "Тема оформлення" +admin_help: "Допомога" admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" -admin_snippets: "Snippets" +admin_logout: "Вихід" +admin_profile: "Профіль" +admin_view_site: "Переглянути сайт" +admin_snippets: "Сніпети" admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" -admin_add: "Add" +admin_off: "Вимкнено" +admin_on: "Увімкнуто" +admin_add: "Додати" admin_entry_attributes: "Entry Attributes" admin_fieldset_for_template: "Fieldset for template" -admin_content: "Content" +admin_content: "Контент" admin_create_new_entry: "Create New Entry" -admin_date: "Date" +admin_date: "Дата" admin_draft: "Draft" -admin_edit: "Edit" -admin_menus: "Menus" -admin_blocks: "Blocks" -admin_media: "Media" -admin_settings: "Settings" -admin_templates: "Templates" +admin_edit: "Редагувати" +admin_menus: "Меню" +admin_blocks: "Блоки" +admin_media: "Медіа-файли" +admin_settings: "Налаштування" +admin_templates: "Шаблони" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" -admin_image_preview: "Image preview" +admin_image_preview: "Попередній перегляд" admin_move: "Move" admin_parent_entry: "Entry parent" -admin_preview: "Preview" -admin_publish: "Publish" -admin_rename: "Rename" +admin_preview: "Попередній перегляд" +admin_publish: "Опублікувати" +admin_rename: "Перейменувати" admin_save_entry: "Save entry" -admin_template: "Template" -admin_title: "Title" +admin_template: "Шаблон" +admin_title: "Заголовок" admin_url: "Url" admin_view: "View" admin_visibility: "Visibility" @@ -81,24 +81,24 @@ admin_error404_title: "Error404 entry title" admin_error404_description: "Error404 entry description" admin_error404_content: "Error404 entry content" admin_error404_template: "Error404 entry template" -admin_heading: "Settings" -admin_general: "General" -admin_error_404_page: "Error 404 page" -admin_cache: "Cache" -admin_author_email: "Author email" -admin_author_name: "Author name" -admin_site_description: "Site description" -admin_site_keywords: "Site keywords" -admin_site_robots: "Robots" -admin_site_title: "Site title" -admin_system: "System" -admin_cache_driver: "Cache driver" -admin_cache_enabled: "Cache enabled" -admin_cache_lifetime: "Cache lifetime" -admin_cache_prefix: "Cache prefix" +admin_heading: "Налаштування" +admin_general: "Загальні" +admin_error_404_page: "Сторінка з помилкою 404" +admin_cache: "Кеш" +admin_author_email: "Електронна пошта автора" +admin_author_name: "Ім'я автора" +admin_site_description: "Опис сайту" +admin_site_keywords: "Ключові слова сайту" +admin_site_robots: "Роботи" +admin_site_title: "Заголовок сайта" +admin_system: "Система" +admin_cache_driver: "Кеш драйвера" +admin_cache_enabled: "Кеш включений" +admin_cache_lifetime: "Тривалість зберігання кешу" +admin_cache_prefix: "Кеш префікс" admin_charset: "Charset" -admin_date_format: "Date format" -admin_errors_display: "Display errors" +admin_date_format: "Формат дати" +admin_errors_display: "Відображати помилки" admin_locale: "Locale" admin_entry_main: "Main entry" admin_theme: "Theme" From 0f36939562db672eaefd708dbc5e0cf9e7a68ed9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 10:44:23 +0300 Subject: [PATCH 0087/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 68 ++++++++++++------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 2c2b29f5..e9591442 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -50,37 +50,37 @@ admin_rename: "Перейменувати" admin_save_entry: "Save entry" admin_template: "Шаблон" admin_title: "Заголовок" -admin_url: "Url" -admin_view: "View" -admin_visibility: "Visibility" -admin_visible: "Visible" -admin_password: "Password" +admin_url: "URL-адреса" +admin_view: "Вигляд" +admin_visibility: "Видимість" +admin_visible: "Видимий" +admin_password: "Пароль" admin_php_built_on: "PHP Built On" -admin_php_version: "PHP Version" -admin_author_url: "Author url" -admin_bugs: "Bugs" -admin_description: "Description" -admin_get_more_plugins: "Get More Plugins" -admin_homepage: "Homepage" -admin_info: "Info" -admin_license: "License" -admin_status: "Status" -admin_disabled: "disabled" -admin_enabled: "enabled" -admin_version: "Version" -admin_role: "Role" -admin_save: "Save" -admin_security_check_results: "Security check results" -admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." -admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_server: "Server" -admin_site: "Site" -admin_clear_cache: "Clear cache" -admin_error404_title: "Error404 entry title" -admin_error404_description: "Error404 entry description" -admin_error404_content: "Error404 entry content" -admin_error404_template: "Error404 entry template" +admin_php_version: "Версія PHP" +admin_author_url: "URL автора" +admin_bugs: "Помилка" +admin_description: "Опис" +admin_get_more_plugins: "Отримати більше плагінів" +admin_homepage: "Домашня сторінка" +admin_info: "Інформація" +admin_license: "Ліцензія" +admin_status: "Статус" +admin_disabled: "Вимкнено" +admin_enabled: "Увімкнено" +admin_version: "Версія" +admin_role: "Роль" +admin_save: "Зберегти" +admin_security_check_results: "Результатів перевірки безпеки" +admin_security_check_results_debug: "У зв'язку з тип і обсяг інформації, що помилка може дати зловмисників, коли ВІДОБРАЖЕННЯ помилок-правда, ми настійно радимо налаштування ВІДОБРАЖЕННЯ помилок ПОМИЛКОВИХ систем виробництва." +admin_security_check_results_htaccess: "Htaccess файл Flextype було встановлено, бути для запису. Ми б радили Вам, щоб видалити всі права на запис.
для цього на Unix-подібних системах з: chmod a-w: шлях" +admin_security_check_results_index: "Htaccess файл Flextype було встановлено, бути для запису. Ми б радили Вам, щоб видалити всі права на запис.
для цього на Unix-подібних системах з: chmod a-w: шлях" +admin_server: "Сервер" +admin_site: "Сайт" +admin_clear_cache: "Очистити кеш" +admin_error404_title: "Назва Error404" +admin_error404_description: "Error404 запис Опис" +admin_error404_content: "Назва Error404" +admin_error404_template: "Запис шаблону Error404" admin_heading: "Налаштування" admin_general: "Загальні" admin_error_404_page: "Сторінка з помилкою 404" @@ -112,10 +112,10 @@ admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" -admin_delete: "Delete" -admin_order: "Order" -admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" +admin_delete: "Видалити" +admin_order: "Замовлення" +admin_edit_category: "Редагувати категорію" +admin_create_new_menu: "Створити нове меню" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" From b6713e8a1655066f6bf3fb7548cb70430530eb5c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 17:34:00 +0300 Subject: [PATCH 0088/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index e9591442..f2bc04e7 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -38,8 +38,8 @@ admin_templates: "Шаблони" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" -admin_upload: "Upload" +admin_files: "Файли" +admin_upload: "Завантажити" admin_hidden: "Hidden" admin_image_preview: "Попередній перегляд" admin_move: "Move" @@ -47,7 +47,7 @@ admin_parent_entry: "Entry parent" admin_preview: "Попередній перегляд" admin_publish: "Опублікувати" admin_rename: "Перейменувати" -admin_save_entry: "Save entry" +admin_save_entry: "Зберегти запис" admin_template: "Шаблон" admin_title: "Заголовок" admin_url: "URL-адреса" @@ -55,7 +55,7 @@ admin_view: "Вигляд" admin_visibility: "Видимість" admin_visible: "Видимий" admin_password: "Пароль" -admin_php_built_on: "PHP Built On" +admin_php_built_on: "Побудований на PHP" admin_php_version: "Версія PHP" admin_author_url: "URL автора" admin_bugs: "Помилка" @@ -99,19 +99,19 @@ admin_cache_prefix: "Кеш префікс" admin_charset: "Charset" admin_date_format: "Формат дати" admin_errors_display: "Відображати помилки" -admin_locale: "Locale" +admin_locale: "Мова" admin_entry_main: "Main entry" -admin_theme: "Theme" -admin_timezone: "Timezone" -admin_username: "Username" +admin_theme: "Тема оформлення" +admin_timezone: "Часовий пояс" +admin_username: "Користувач" admin_create_user: "Create User" admin_create_new_user: "Create New User" -admin_web_server: "Web Server" -admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" -admin_create_new_category: "Create New Category" -admin_delete_category: "Delete Category" -admin_create_new_item: "Create New Item" +admin_web_server: "Веб-сервер" +admin_web_server_php_interface: "Веб-сервер для PHP інтерфейс" +admin_menu: "Меню" +admin_create_new_category: "Створити нову категорію" +admin_delete_category: "Видалити категорію" +admin_create_new_item: "Створити новий елемент" admin_delete: "Видалити" admin_order: "Замовлення" admin_edit_category: "Редагувати категорію" @@ -119,19 +119,19 @@ admin_create_new_menu: "Створити нове меню" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" -admin_duplicate: "Duplicate" +admin_duplicate: "Створити копію" admin_summary: "Summary" -admin_snippet: "Snippet" -admin_type: "Type" -admin_partial: "Partial" -admin_clone: "Clone" -admin_create_new_snippet: "Create New Snippet" -admin_create_new_template: "Create New Template" -admin_message_template_created: "Template created" -admin_message_template_deleted: "Template deleted" +admin_snippet: "Сніпети" +admin_type: "Тип" +admin_partial: "Частково" +admin_clone: "Клонувати" +admin_create_new_snippet: "Створити новий сніпет тут" +admin_create_new_template: "Створити новий шаблон" +admin_message_template_created: "Шаблон створений" +admin_message_template_deleted: "Шаблон видалено" admin_message_template_renamed: "Template renamed" -admin_message_template_duplicated: "Template duplicated" -admin_message_template_saved: "Template saved" +admin_message_template_duplicated: "Шаблон дублюється" +admin_message_template_saved: "Шаблон збережено" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" From cc3ca2c8b42008f349c6065f09ace88a16f520e4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 22:55:24 +0300 Subject: [PATCH 0089/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 96 ++++++++++++------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 374ecc75..36484a65 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -1,53 +1,53 @@ --- -admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" +admin: "Amministratore" +admin_cancel: "Annulla" +admin_create: "Crea" admin_debugging: "Debugging" admin_email: "Email" -admin_flextype_version: "Flextype Version" -admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" +admin_flextype_version: "Versione Flextype" +admin_information: "Informazioni" +admin_installed: "Installato" +admin_keywords: "Parole Chiave" admin_login: "Login" -admin_entries: "Entries" -admin_extends: "Extends" +admin_entries: "Elementi" +admin_extends: "Estendi" admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Help" -admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" +admin_themes: "Temi" +admin_help: "Aiuto" +admin_getting_help: "Ottenere aiuto" +admin_logout: "Disconnetti" +admin_profile: "Profilo" +admin_view_site: "Visualizza il sito" admin_snippets: "Snippets" -admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" -admin_add: "Add" -admin_entry_attributes: "Entry Attributes" -admin_fieldset_for_template: "Fieldset for template" -admin_content: "Content" -admin_create_new_entry: "Create New Entry" -admin_date: "Date" -admin_draft: "Draft" -admin_edit: "Edit" -admin_menus: "Menus" -admin_blocks: "Blocks" +admin_not_installed: "Non installato" +admin_off: "Disattivo" +admin_on: "Attivo" +admin_add: "Aggiungi" +admin_entry_attributes: "Attributi degli elementi" +admin_fieldset_for_template: "Campi per template" +admin_content: "Contenuto" +admin_create_new_entry: "Crea nuovo elemento" +admin_date: "Data" +admin_draft: "Bozza" +admin_edit: "Modifica" +admin_menus: "Menu" +admin_blocks: "Blocchi" admin_media: "Media" -admin_settings: "Settings" +admin_settings: "Impostazioni" admin_templates: "Templates" -admin_entry: "Entry" -admin_fieldset: "Fieldset" -admin_source: "Source" -admin_files: "Files" -admin_upload: "Upload" -admin_hidden: "Hidden" -admin_image_preview: "Image preview" -admin_move: "Move" -admin_parent_entry: "Entry parent" -admin_preview: "Preview" -admin_publish: "Publish" -admin_rename: "Rename" -admin_save_entry: "Save entry" +admin_entry: "Elemento" +admin_fieldset: "Campi" +admin_source: "Sorgente" +admin_files: "File" +admin_upload: "Carica File" +admin_hidden: "Nascosto" +admin_image_preview: "Anteprima immagine" +admin_move: "Sposta" +admin_parent_entry: "Elemento padre" +admin_preview: "Anteprima" +admin_publish: "Pubblica" +admin_rename: "Rinomina" +admin_save_entry: "Salva elemento" admin_template: "Template" admin_title: "Title" admin_url: "Url" @@ -99,13 +99,13 @@ admin_cache_prefix: "Cache prefix" admin_charset: "Charset" admin_date_format: "Date format" admin_errors_display: "Display errors" -admin_locale: "Locale" -admin_entry_main: "Main entry" -admin_theme: "Theme" -admin_timezone: "Timezone" +admin_locale: "Lingua" +admin_entry_main: "Elemento principale" +admin_theme: "Tema" +admin_timezone: "Fuso orario" admin_username: "Username" -admin_create_user: "Create User" -admin_create_new_user: "Create New User" +admin_create_user: "Crea utente" +admin_create_new_user: "Crea nuovo utente" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" admin_menu: "Menu" From e926a01e2ae20ca2c0c44bbce68721e80d2ce62c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 28 Jan 2019 23:05:39 +0300 Subject: [PATCH 0090/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 36484a65..d7d0bc33 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -109,32 +109,32 @@ admin_create_new_user: "Crea nuovo utente" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" admin_menu: "Menu" -admin_create_new_category: "Create New Category" -admin_delete_category: "Delete Category" -admin_create_new_item: "Create New Item" -admin_delete: "Delete" -admin_order: "Order" -admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" -admin_fieldsets: "Fieldsets" -admin_template_create_new: "Create New Template" -admin_create_new_fieldset: "Create New Fieldset" -admin_duplicate: "Duplicate" -admin_summary: "Summary" +admin_create_new_category: "Crea una nuova categoria" +admin_delete_category: "Elimina Categoria" +admin_create_new_item: "Crea nuovo elemento" +admin_delete: "Elimina" +admin_order: "Ordina" +admin_edit_category: "Modifica categoria" +admin_create_new_menu: "Crea nuovo elemento" +admin_fieldsets: "Campi" +admin_template_create_new: "Crea nuovo template" +admin_create_new_fieldset: "Crea nuovo Fieldset" +admin_duplicate: "Duplica" +admin_summary: "Sommario" admin_snippet: "Snippet" -admin_type: "Type" -admin_partial: "Partial" -admin_clone: "Clone" -admin_create_new_snippet: "Create New Snippet" -admin_create_new_template: "Create New Template" -admin_message_template_created: "Template created" -admin_message_template_deleted: "Template deleted" -admin_message_template_renamed: "Template renamed" -admin_message_template_duplicated: "Template duplicated" -admin_message_template_saved: "Template saved" -admin_message_snippet_saved: "Snippet saved" -admin_message_snippet_created: "Snippet created" -admin_message_snippet_deleted: "Snippet deleted" +admin_type: "Tipo" +admin_partial: "Parziale" +admin_clone: "Clona" +admin_create_new_snippet: "Crea nuovo snippet" +admin_create_new_template: "Crea nuovo template" +admin_message_template_created: "Template creato" +admin_message_template_deleted: "Template eliminato" +admin_message_template_renamed: "Template rinominato" +admin_message_template_duplicated: "Template duplicato" +admin_message_template_saved: "Template salvato" +admin_message_snippet_saved: "Snippet salvato" +admin_message_snippet_created: "Snippet creato" +admin_message_snippet_deleted: "Snippet eliminato" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" admin_message_menu_saved: "Menu saved" From d9c620f9388b017380b389bc0f0f1f238a0e2f99 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 29 Jan 2019 13:55:17 +0300 Subject: [PATCH 0091/1219] Admin Panel: translates fixes --- site/plugins/admin/languages/en_US.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index b26a6ab0..b43fecb3 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -185,3 +185,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From e59b366755fee0b24162f4a275ecf5fa7a630bd7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 29 Jan 2019 14:03:58 +0300 Subject: [PATCH 0092/1219] Admin Panel: Entries Manager - select field added --- site/plugins/admin/classes/EntriesManager.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 727394a1..c9ccea9f 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -410,6 +410,11 @@ class EntriesManager $form_element = Form::textarea($element, $content, $property['attributes']); break; + // Selectbox field + case 'select': + $form_element = Form::select($form_element_name, $property['options'], $form_value, $property['attributes']); + break; + // Template select field for selecting entry template case 'template_select': $form_element = Form::select($form_element_name, Themes::getTemplates(), $form_value, $property['attributes']); From 971d4bcd8bd0fc67865b77d5db96bbeef7ad048d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:04:59 +0300 Subject: [PATCH 0093/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 74a3c6a1f1a2a748e6a5e0d101d4938663422fe0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:01 +0300 Subject: [PATCH 0094/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From b36515e834b80ec29015626526d3b04bc16b51d4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:03 +0300 Subject: [PATCH 0095/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index f2bc04e7..921d0668 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 1e08a2e458635677a65da4824fa6c7d11913e382 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:05 +0300 Subject: [PATCH 0096/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 4b892925..e982d2af 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 5bcc45177fc9164bddec12f4ab07eff7ad0f3b13 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:07 +0300 Subject: [PATCH 0097/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From c80e7e3801a866ec7c1b1b555370fa4db5d3b5d1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:09 +0300 Subject: [PATCH 0098/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 54a4144d1c444de3bc2dba4b46d64fd110f66b9c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:10 +0300 Subject: [PATCH 0099/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From bc0ed460f762a0586f91bb5a9e830af08f9dc315 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:12 +0300 Subject: [PATCH 0100/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index b640e077..10f32074 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "База данных SQLite3" admin_sqlite3_table: "Таблица SQLite3" admin_error_name_empty_input: "Название должно быть буквенно-цифровое значение (от 1 симв.)" admin_error_title_empty_input: "Заголовок должен иметь буквенно-цифровое значение (от 1 симв.)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 10e33035610253c1596e91a9afab2349caf67b6f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:13 +0300 Subject: [PATCH 0101/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From f966905cc48bd1ba598d9d8593fc32a70a014495 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:15 +0300 Subject: [PATCH 0102/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 652e1036..4fc24608 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 45da54dacb2460690306a9ca6d1f4dbc1efcb3a9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:17 +0300 Subject: [PATCH 0103/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 3723abc85502222e46e11f11972e2a730a7fa13f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:20 +0300 Subject: [PATCH 0104/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 83d86e62..62297283 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "Baza danych SQLite3" admin_sqlite3_table: "Tabela SQLite3" admin_error_name_empty_input: "Nazwa musi być wartością alfanumeryczną" admin_error_title_empty_input: "Tytuł musi być wartością alfanumeryczną" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From f994246c7faba08037c0e393d9501f1e343ba02d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:21 +0300 Subject: [PATCH 0105/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From a861eaa32b3ab3bcc64baf4585bfce43cb432685 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:22 +0300 Subject: [PATCH 0106/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From b8e3bd810c74ccba9cfcbac8436f1bd98e2790bb Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:24 +0300 Subject: [PATCH 0107/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index d7d0bc33..60f1c41b 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 4cd097b34317f2357e9fc1de71ca22f933e2d5ea Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:25 +0300 Subject: [PATCH 0108/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 864b348d412ef1940cc36618422a62ba5cd7d92b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:27 +0300 Subject: [PATCH 0109/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 96fcd85ac3b77edeed3a0852a5b116287783ab33 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:28 +0300 Subject: [PATCH 0110/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 0f5fd7ddfc72f0902c60d84e04d586026fbd92d6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:30 +0300 Subject: [PATCH 0111/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 4a50c37a6324576344a9af2589eef10685540b8c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:31 +0300 Subject: [PATCH 0112/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index a71da1a6..8e382832 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Datenbank" admin_sqlite3_table: "SQLite3 Tabelle" admin_error_name_empty_input: "Name muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" admin_error_title_empty_input: "Titel muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 2bcb0426e8a75c591ade97100eca00f552841fde Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:33 +0300 Subject: [PATCH 0113/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 604c024c203678f99afd8843f62db3e304999dcd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:35 +0300 Subject: [PATCH 0114/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From a16303ae0b6ccb53fcb2dd2396b87744bffcc52a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:37 +0300 Subject: [PATCH 0115/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 73c4fc43..2e1bf4d1 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 831aa7dd04019d7cbbc20b7e70a7ecd009ec3440 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:38 +0300 Subject: [PATCH 0116/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From bb1f8d43f7a610405b7b0871504d5a832ae77590 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:39 +0300 Subject: [PATCH 0117/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 52aab209..89735b4b 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From bda1fb5e6ccfc856864ca30c880cebbac995b492 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:41 +0300 Subject: [PATCH 0118/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 980091b6..574b320e 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 databaza" admin_sqlite3_table: "SQLite3 Tablica" admin_error_name_empty_input: "Ime mora biti alfanumerička vrijednost" admin_error_title_empty_input: "Naslov mora biti alfanumerička vrijednost" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 2f141a8f620b5d660d05923f424642e39029759c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:42 +0300 Subject: [PATCH 0119/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 12eb555340f02b5cca89471534797857dde59e64 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:43 +0300 Subject: [PATCH 0120/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 005555ef9ec49a4980a0cc5b49e2f2bb0a933e18 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:45 +0300 Subject: [PATCH 0121/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 2fae3dae7adca507f455fd3163d358572c98cdcd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 29 Jan 2019 14:05:47 +0300 Subject: [PATCH 0122/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index 374ecc75..d034c7b0 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -186,3 +186,6 @@ admin_sqlite3_database: "SQLite3 Database" admin_sqlite3_table: "SQLite3 Table" admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" +admin_entries_visible: "Visible" +admin_entries_draft: "Draft" +admin_entries_hidden: "Hidden" From 39ce292b404062b850ab1d6736a0783ed1d9afec Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 00:08:16 +0300 Subject: [PATCH 0123/1219] Admin Panel: Fixing getting help links --- site/plugins/admin/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index c61aa845..0ed70d46 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -56,9 +56,9 @@ if (Admin::isAdminArea()) { NavigationManager::addItem('settings', 'infomation', '' . __('admin_information', Registry::get('settings.locale')), Http::getBaseUrl() . '/admin/information', ['class' => 'nav-link']); if (Registry::get('settings.locale') == 'ru') { - NavigationManager::addItem('help', 'documentation', '' . __('admin_getting_help', Registry::get('settings.locale')), 'http://flextype.ru/documentation/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); + NavigationManager::addItem('help', 'documentation', '' . __('admin_getting_help', Registry::get('settings.locale')), 'http://flextype.org/ru/documentation/guide/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); } else { - NavigationManager::addItem('help', 'documentation', '' . __('admin_getting_help', Registry::get('settings.locale')), 'http://flextype.org/documentation/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); + NavigationManager::addItem('help', 'documentation', '' . __('admin_getting_help', Registry::get('settings.locale')), 'http://flextype.org/en/documentation/guide/basics/getting-help', ['class' => 'nav-link', 'target' => '_blank']); } // Initializes the Notification service. From 15b5599b825632e7df215501098c67a69146d7ff Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 00:13:40 +0300 Subject: [PATCH 0124/1219] Admin Panel: translates fixes --- site/plugins/admin/languages/en_US.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index b43fecb3..18045f14 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -37,7 +37,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From f183c26a1a57740dd14ab0a6830470c49ef4d78a Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 00:14:01 +0300 Subject: [PATCH 0125/1219] Admin Panel: translates fixes --- site/themes/default/fieldsets/about.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/default/fieldsets/about.yaml b/site/themes/default/fieldsets/about.yaml index 5a0dae20..36d7c1f8 100644 --- a/site/themes/default/fieldsets/about.yaml +++ b/site/themes/default/fieldsets/about.yaml @@ -9,6 +9,6 @@ fields: type: html size: col-12 image: - title: admin_entries_files + title: admin_media type: media_select size: col-3 \ No newline at end of file From 61cf69d4f7b2e939fbc7c83d5f8e9e83c9aecf76 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:22 +0300 Subject: [PATCH 0126/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 54fe24ac3c02e56966223d08198b03769a160acf Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:24 +0300 Subject: [PATCH 0127/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From c01043e83aad029800ecc968e07ba21b4381bc67 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:25 +0300 Subject: [PATCH 0128/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 921d0668..59529c4e 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -38,7 +38,6 @@ admin_templates: "Шаблони" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Файли" admin_upload: "Завантажити" admin_hidden: "Hidden" admin_image_preview: "Попередній перегляд" From 27f87f128b2d01a4b4c5a82f61960a6fb2a5c66d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:27 +0300 Subject: [PATCH 0129/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index e982d2af..30eb18fd 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -38,7 +38,6 @@ admin_templates: "Şablonlar" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Kaynak" -admin_files: "Dosyalar" admin_upload: "Yükle" admin_hidden: "Gizli" admin_image_preview: "Resim önizleme" From bf43fa8c2e61dde9577e9dbeab1a0121dcc8d965 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:28 +0300 Subject: [PATCH 0130/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 4cac128b076cfa78698c336dd9723406a8c607dd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:30 +0300 Subject: [PATCH 0131/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 97d572802de33dc0c071bd4691fea089cf9869bd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:31 +0300 Subject: [PATCH 0132/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 494ab6bc24a5e56a23f35de4b5bea9baf603f834 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:33 +0300 Subject: [PATCH 0133/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 10f32074..aecf20e7 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -38,7 +38,6 @@ admin_templates: "Шаблоны" admin_entry: "Записи" admin_fieldset: "Поле" admin_source: "Код" -admin_files: "Файлы" admin_upload: "Загрузить" admin_hidden: "Скрытый" admin_image_preview: "Просмотр изображения" From 52d911ccab16e7e50aece5ef3a367afb6c93394f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:34 +0300 Subject: [PATCH 0134/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 085b1339ec312dc9bcbe12af62b45dcee4a3b45e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:36 +0300 Subject: [PATCH 0135/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 4fc24608..89955356 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 7c33cf75363dcefcaa82989a3bacfcdec82f409d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:37 +0300 Subject: [PATCH 0136/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 375c0b2c0c60b29b6fcda5610015afb43fd18fdf Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:39 +0300 Subject: [PATCH 0137/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 62297283..3f506bb0 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -38,7 +38,6 @@ admin_templates: "Szablony" admin_entry: "Wpis" admin_fieldset: "Zestaw pól" admin_source: "Źródło" -admin_files: "Pliki" admin_upload: "Wrzuć plik" admin_hidden: "Ukryty" admin_image_preview: "Podgląd obrazu" From ec01aedacd43244e09cb51a0e6daaf49bb0a1cfe Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:40 +0300 Subject: [PATCH 0138/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From f46f6b009302aedc7ebdcb6034ae02df2e525fe6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:41 +0300 Subject: [PATCH 0139/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 3444a71ffa3aba3daece34d1517901911261e780 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:43 +0300 Subject: [PATCH 0140/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 60f1c41b..858df245 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Elemento" admin_fieldset: "Campi" admin_source: "Sorgente" -admin_files: "File" admin_upload: "Carica File" admin_hidden: "Nascosto" admin_image_preview: "Anteprima immagine" From 5e7cc5f0c5be4b2ec5a97a0f08080e492b0d705e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:45 +0300 Subject: [PATCH 0141/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From eee4c8197576b29fdc22fecd40e46b6984b73b94 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:46 +0300 Subject: [PATCH 0142/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From a37d96210746e263e48a1b629c36e06fc0b93e95 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:48 +0300 Subject: [PATCH 0143/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 816487c210b8de3003624dfd9538c15512b0eaee Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:49 +0300 Subject: [PATCH 0144/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 4a2289e0ea7a401d047d3212b684c90b006b0c71 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:51 +0300 Subject: [PATCH 0145/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 8e382832..c7d0a27a 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -38,7 +38,6 @@ admin_templates: "Vorlagen" admin_entry: "Eintrag" admin_fieldset: "Fieldset" admin_source: "Quelle" -admin_files: "Dateien" admin_upload: "Hochladen" admin_hidden: "Versteckt" admin_image_preview: "Bildvorschau" From 4b9041462a7e807d67d22fb1d526be641f8599a9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:52 +0300 Subject: [PATCH 0146/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From fe60a718810ee8142b1013fda840e577e377ba97 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:53 +0300 Subject: [PATCH 0147/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 2873bf1b1cdb324b7fda0d2f3c541fbf6fcfd301 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:55 +0300 Subject: [PATCH 0148/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 2e1bf4d1..8e222292 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -38,7 +38,6 @@ admin_templates: "Sjablonen" admin_entry: "Invoer" admin_fieldset: "Veldenset" admin_source: "Bron" -admin_files: "Bestanden" admin_upload: "Uploaden" admin_hidden: "Verborgen" admin_image_preview: "Image voorbeeld" From 2ef559fb5f375f7918d7368ba22bcedff8f005c8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:57 +0300 Subject: [PATCH 0149/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 1d6d93c21d4ec350a7a0b5cd97026ea19a5d20de Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:15:59 +0300 Subject: [PATCH 0150/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 89735b4b..45ca8bee 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -38,7 +38,6 @@ admin_templates: "Šablony" admin_entry: "Entry" admin_fieldset: "Datové pole" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 849909af93af5f09c08eb4ed4367c6e127c286c7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:16:00 +0300 Subject: [PATCH 0151/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 574b320e..2dc81b8c 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -38,7 +38,6 @@ admin_templates: "Predlošci" admin_entry: "Unos" admin_fieldset: "Skup polja" admin_source: "Izvor" -admin_files: "Fajlovi" admin_upload: "Postavljanje" admin_hidden: "Skriveno" admin_image_preview: "Pregled slike" From 896c5fc84b7126c28e12eef6a47b0ac1398c8c13 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:16:02 +0300 Subject: [PATCH 0152/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From e4fc2ab819bb91df6a9523105ecb8d87f5117e38 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:16:04 +0300 Subject: [PATCH 0153/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From dd599279907cc4464b7e77bc916be35b142f4309 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:16:05 +0300 Subject: [PATCH 0154/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From e3deb4598d03562e39f8f69390acf3d0ed923f90 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 30 Jan 2019 00:16:07 +0300 Subject: [PATCH 0155/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index d034c7b0..1395394e 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -38,7 +38,6 @@ admin_templates: "Templates" admin_entry: "Entry" admin_fieldset: "Fieldset" admin_source: "Source" -admin_files: "Files" admin_upload: "Upload" admin_hidden: "Hidden" admin_image_preview: "Image preview" From 2b09e274785a5216f68b739623223717fe8d4cbb Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 00:36:40 +0300 Subject: [PATCH 0156/1219] Flextype Core: Snippets improvements and refactoring --- flextype/Snippets.php | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 341fa3b8..f78d974f 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -29,8 +29,34 @@ class Snippets */ public static function get(string $snippet_name) { - $snippet_path = PATH['snippets'] . '/' . $snippet_name . '.php'; + $vars['get'] = $snippet_name; + return Snippets::_snippet($vars); + } + + /** + * _snippet + * + * Snippets::get('snippet-name'); + * Snippets::get('snippetname', ['message' => 'Hello World']); + * + * @access private + * @param array $vars Vars + * @return string|bool Returns the contents of the output buffer and end output buffering. + * If output buffering isn't active then FALSE is returned. + */ + private static function _snippet(array $vars) { + + // Extracst attributes + extract($vars); + + // Get snippet name + $name = (isset($get)) ? (string) $get : ''; + + // Define snippet path + $snippet_path = PATH['snippets'] . '/' . $name . '.php'; + + // Process snippet if (Filesystem::fileExists($snippet_path)) { // Turn on output buffering @@ -42,7 +68,7 @@ class Snippets // Output... return ob_get_clean(); } else { - throw new \RuntimeException("Snippet {$snippet_name} does not exist."); + throw new \RuntimeException("Snippet {$name} does not exist."); } } } From 7b99d4d7507ff62af10f91cf9337b93e0ada624e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 00:39:15 +0300 Subject: [PATCH 0157/1219] Flextype Core: Shortcodes - general names updates - [snippet name] to [snippets get] - [image] to [images] - [image_url] to [images_url] --- flextype/Shortcodes.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 8092f06f..fc122f7d 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -120,15 +120,15 @@ class Shortcodes { }); // Snippets - // Shortcode: [snippet name=snippet-name] - Shortcodes::shortcode()->addHandler('snippet', function(ShortcodeInterface $s) { - return Snippets::get($s->getParameter('name')); + // Shortcode: [snippets get=snippet-name] + Shortcodes::shortcode()->addHandler('snippets', function(ShortcodeInterface $s) { + return Snippets::get($s->getParameter('get')); }); // Images - // Shortcode: [image path="home/image.jpg"] + // Shortcode: [images path="home/image.jpg"] // Result: Display image - Shortcodes::shortcode()->addHandler('image', function(ShortcodeInterface $s) { + Shortcodes::shortcode()->addHandler('images', function(ShortcodeInterface $s) { $params = []; $attributes = []; @@ -171,9 +171,9 @@ class Shortcodes { }); // Images - // Shortcode: [image_url path="home/image.jpg"] + // Shortcode: [images_url path="home/image.jpg"] // Result: Display image url - Shortcodes::shortcode()->addHandler('image_url', function(ShortcodeInterface $s) { + Shortcodes::shortcode()->addHandler('images_url', function(ShortcodeInterface $s) { $params = []; // API From 39b3a630004a98389441ef0183bd7bb4177b6818 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 01:06:26 +0300 Subject: [PATCH 0158/1219] Admin Panel: Plugins Manager - fix link for Get More Plugins --- site/plugins/admin/views/templates/extends/plugins/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/plugins/list.php b/site/plugins/admin/views/templates/extends/plugins/list.php index 75238dcd..56b0b358 100644 --- a/site/plugins/admin/views/templates/extends/plugins/list.php +++ b/site/plugins/admin/views/templates/extends/plugins/list.php @@ -15,7 +15,7 @@ Themes::view('admin/views/partials/navbar') ]) ->assign('buttons', [ 'plugins_get_more' => [ - 'link' => 'http://flextype.org/download/plugins', + 'link' => 'https://github.com/flextype/plugins', 'title' => __('admin_get_more_plugins'), 'attributes' => ['class' => 'float-right btn', 'target' => '_blank'] ] From aa8f2c9e45e13f14c6754ccd2bc1ac0b449b9df9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 30 Jan 2019 01:08:16 +0300 Subject: [PATCH 0159/1219] Flextype Core: Shortcodes - general names updates - [snippet name] to [snippets get] --- site/plugins/admin/views/templates/extends/snippets/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/snippets/list.php b/site/plugins/admin/views/templates/extends/snippets/list.php index dce6fa2f..07d3b6d4 100644 --- a/site/plugins/admin/views/templates/extends/snippets/list.php +++ b/site/plugins/admin/views/templates/extends/snippets/list.php @@ -71,7 +71,7 @@

BsQ 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 From cafe0dfe4c6b549c20e19636ea5a10a98c4a7229 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 18 Jan 2019 01:32:43 +0300 Subject: [PATCH 0023/1219] Flextype Core: Using new languages files format --- flextype/config/settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/config/settings.yaml b/flextype/config/settings.yaml index 17302830..927292f6 100644 --- a/flextype/config/settings.yaml +++ b/flextype/config/settings.yaml @@ -40,7 +40,7 @@ date_format: "F d Y H:i:s" theme: default # The locale that'll be used by the Flextype. -locale: "en" +locale: "en_US" # The entries settings # Define the file types (extensions to be exact) that are acceptable for upload. From 6a4459c67508f37ba349d233edca1ff197cb1fb3 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 18 Jan 2019 01:40:06 +0300 Subject: [PATCH 0024/1219] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 95b5700c..b104a52c 100755 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ![preview](/site/plugins/admin/preview.png)

- + - +
- disabled> + disabled>
diff --git a/site/plugins/admin/views/templates/extends/snippets/add.php b/site/plugins/admin/views/templates/extends/snippets/add.php index b3051928..8fedd3a4 100644 --- a/site/plugins/admin/views/templates/extends/snippets/add.php +++ b/site/plugins/admin/views/templates/extends/snippets/add.php @@ -16,12 +16,12 @@ Themes::view('admin/views/partials/navbar') 'title' => __('admin_snippets'), 'attributes' => ['class' => 'navbar-item'] ], - 'snippets_add' => [ + 'snippets_add' => [ 'link' => Http::getBaseUrl() . '/admin/snippets/add', 'title' => __('admin_create_new_snippet'), 'attributes' => ['class' => 'navbar-item active'] - ] - ]) + ] + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/edit.php b/site/plugins/admin/views/templates/extends/snippets/edit.php index 800587a4..7d3dd265 100644 --- a/site/plugins/admin/views/templates/extends/snippets/edit.php +++ b/site/plugins/admin/views/templates/extends/snippets/edit.php @@ -11,19 +11,19 @@ use function Flextype\Component\I18n\__; Themes::view('admin/views/partials/head')->display(); Themes::view('admin/views/partials/navbar') ->assign('links', [ - 'snippet' => [ + 'snippet' => [ 'link' => Http::getBaseUrl() . '/admin/snippets/edit?snippet=' . Http::get('snippet'), 'title' => __('admin_snippet'), 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ] - ]) + ] + ]) + ->assign('buttons', [ + 'save_entry' => [ + 'link' => 'javascript:;', + 'title' => __('admin_save'), + 'attributes' => ['class' => 'js-save-form-submit float-right btn'] + ] + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/list.php b/site/plugins/admin/views/templates/extends/snippets/list.php index 07d3b6d4..a4c028c6 100644 --- a/site/plugins/admin/views/templates/extends/snippets/list.php +++ b/site/plugins/admin/views/templates/extends/snippets/list.php @@ -3,19 +3,19 @@ display() ?> assign('links', [ + ->assign('links', [ 'snippets' => [ 'link' => Http::getBaseUrl() . '/admin/snippets', 'title' => __('admin_snippets'), 'attributes' => ['class' => 'navbar-item active'] - ] + ] ]) ->assign('buttons', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/snippets/add', 'title' => __('admin_create_new_snippet'), 'attributes' => ['class' => 'float-right btn'] - ] + ] ]) ->display() ?> diff --git a/site/plugins/admin/views/templates/extends/snippets/rename.php b/site/plugins/admin/views/templates/extends/snippets/rename.php index c4639e57..3fafae41 100644 --- a/site/plugins/admin/views/templates/extends/snippets/rename.php +++ b/site/plugins/admin/views/templates/extends/snippets/rename.php @@ -16,12 +16,12 @@ Themes::view('admin/views/partials/navbar') 'title' => __('admin_snippets'), 'attributes' => ['class' => 'navbar-item'] ], - 'snippets_add' => [ + 'snippets_add' => [ 'link' => Http::getBaseUrl() . '/admin/snippets/rename?snippet=' . $name_current, 'title' => __('admin_rename'), 'attributes' => ['class' => 'navbar-item active'] - ] - ]) + ] + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> @@ -33,7 +33,7 @@ Themes::view('admin/views/partials/content-start')->display();
'snippetName']) ?> - 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> + 'form-control', 'id' => 'snippetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?>
'btn btn-black btn-fill btn-wd']) ?> diff --git a/site/plugins/admin/views/templates/extends/templates/add.php b/site/plugins/admin/views/templates/extends/templates/add.php index 25650108..b21c12fd 100644 --- a/site/plugins/admin/views/templates/extends/templates/add.php +++ b/site/plugins/admin/views/templates/extends/templates/add.php @@ -16,12 +16,12 @@ Themes::view('admin/views/partials/navbar') 'title' => __('admin_templates'), 'attributes' => ['class' => 'navbar-item'] ], - 'templates_add' => [ + 'templates_add' => [ 'link' => Http::getBaseUrl() . '/admin/templates/add', 'title' => __('admin_create_new_template'), 'attributes' => ['class' => 'navbar-item active'] - ] - ]) + ] + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> diff --git a/site/plugins/admin/views/templates/extends/templates/edit.php b/site/plugins/admin/views/templates/extends/templates/edit.php index 2d00a48e..567c6790 100644 --- a/site/plugins/admin/views/templates/extends/templates/edit.php +++ b/site/plugins/admin/views/templates/extends/templates/edit.php @@ -11,19 +11,19 @@ use function Flextype\Component\I18n\__; Themes::view('admin/views/partials/head')->display(); Themes::view('admin/views/partials/navbar') ->assign('links', [ - 'template' => [ + 'template' => [ 'link' => Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::get('template') . '&type='.$type, 'title' => __('admin_template'), 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ] - ]) + ] + ]) + ->assign('buttons', [ + 'save_entry' => [ + 'link' => 'javascript:;', + 'title' => __('admin_save'), + 'attributes' => ['class' => 'js-save-form-submit float-right btn'] + ] + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> diff --git a/site/plugins/admin/views/templates/extends/templates/list.php b/site/plugins/admin/views/templates/extends/templates/list.php index f6065018..0552d1c2 100644 --- a/site/plugins/admin/views/templates/extends/templates/list.php +++ b/site/plugins/admin/views/templates/extends/templates/list.php @@ -3,19 +3,19 @@ display() ?> assign('links', [ + ->assign('links', [ 'templates' => [ 'link' => Http::getBaseUrl() . '/admin/templates', 'title' => __('admin_templates'), 'attributes' => ['class' => 'navbar-item active'] - ] + ] ]) ->assign('buttons', [ 'entries' => [ 'link' => Http::getBaseUrl() . '/admin/templates/add', 'title' => __('admin_create_new_template'), 'attributes' => ['class' => 'float-right btn'] - ] + ] ]) ->display() ?> diff --git a/site/plugins/admin/views/templates/extends/templates/rename.php b/site/plugins/admin/views/templates/extends/templates/rename.php index 596c074d..4b8a0d24 100644 --- a/site/plugins/admin/views/templates/extends/templates/rename.php +++ b/site/plugins/admin/views/templates/extends/templates/rename.php @@ -16,12 +16,12 @@ Themes::view('admin/views/partials/navbar') 'title' => __('admin_templates'), 'attributes' => ['class' => 'navbar-item'] ], - 'templates_add' => [ + 'templates_add' => [ 'link' => Http::getBaseUrl() . '/admin/templates/rename?template=' . $name_current, 'title' => __('admin_rename'), 'attributes' => ['class' => 'navbar-item active'] - ] - ]) + ] + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> @@ -34,7 +34,7 @@ Themes::view('admin/views/partials/content-start')->display();
'templateName']) ?> - 'form-control', 'id' => 'templateName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_template_error_title_empty_input')]) ?> + 'form-control', 'id' => 'templateName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_template_error_title_empty_input')]) ?>
'templateType']) ?> diff --git a/site/plugins/admin/views/templates/system/information/list.php b/site/plugins/admin/views/templates/system/information/list.php index f6827b85..89d7d9f9 100644 --- a/site/plugins/admin/views/templates/system/information/list.php +++ b/site/plugins/admin/views/templates/system/information/list.php @@ -10,8 +10,8 @@ Themes::view('admin/views/partials/navbar') 'link' => Http::getBaseUrl() . '/admin/information', 'title' => __('admin_information'), 'attributes' => ['class' => 'navbar-item active'] - ], - ]) + ], + ]) ->display(); Themes::view('admin/views/partials/content-start')->display(); ?> @@ -26,11 +26,21 @@ Themes::view('admin/views/partials/content-start')->display();
@@ -59,27 +69,27 @@ Themes::view('admin/views/partials/content-start')->display();
'.'Apache Mod Rewrite'.''.__('admin_not_installed').'
' . 'Apache Mod Rewrite' . '' . __('admin_not_installed') . '
'.'Apache Mod Rewrite'.''.__('admin_installed').'
' . 'Apache Mod Rewrite' . '' . __('admin_installed') . '
'.'Apache Mod Rewrite'.''.__('admin_installed').'
' . 'Apache Mod Rewrite' . '' . __('admin_installed') . '
'.'password_hash()'.''.__('admin_not_installed').'
' . 'password_hash()' . '' . __('admin_not_installed') . '
'.'password_hash()'.''.__('admin_installed').'
' . 'password_hash()' . '' . __('admin_installed') . '
'.'password_verify()'.''.__('admin_not_installed').'
' . 'password_verify()' . '' . __('admin_not_installed') . '
'.'password_verify()'.''.__('admin_installed').'
' . 'password_verify()' . '' . __('admin_installed') . '
- - - - - - - - $menu): ?> - - - - - - -
- - -
- - - -
- -
- - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/menus/rename.php b/site/plugins/admin/views/templates/extends/menus/rename.php deleted file mode 100644 index 835fc114..00000000 --- a/site/plugins/admin/views/templates/extends/menus/rename.php +++ /dev/null @@ -1,44 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'menus' => [ - 'link' => Http::getBaseUrl() . '/admin/menus', - 'title' => __('admin_menus'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'menus_add' => [ - 'link' => Http::getBaseUrl() . '/admin/menus/rename?menu=' . $name_current, - 'title' => __('admin_rename'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - -
- 'menuName']) ?> - 'form-control', 'id' => 'menuName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> From 99669d514ba7335ca2fb1203cd14707cbcda9905 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:34 +0300 Subject: [PATCH 0232/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From baf4a0a3f0a5639a70190aa9e90699797404ded5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:35 +0300 Subject: [PATCH 0233/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 815b969d1c69a5276f63fceeeafec188b10c8f3d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:36 +0300 Subject: [PATCH 0234/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 3e70e2a6..ea9f1eaa 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Дата" admin_draft: "Draft" admin_edit: "Редагувати" -admin_menus: "Меню" admin_blocks: "Блоки" admin_media: "Медіа-файли" admin_settings: "Налаштування" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Веб-сервер" admin_web_server_php_interface: "Веб-сервер для PHP інтерфейс" -admin_menu: "Меню" admin_create_new_category: "Створити нову категорію" admin_delete_category: "Видалити категорію" admin_create_new_item: "Створити новий елемент" admin_delete: "Видалити" admin_order: "Замовлення" admin_edit_category: "Редагувати категорію" -admin_create_new_menu: "Створити нове меню" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From aca98f09dcf96e8f5a420c291d09c2208852a0ab Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:38 +0300 Subject: [PATCH 0235/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 5c66f0c5..7a32c4f2 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Tarih" admin_draft: "Taslak" admin_edit: "Düzenle" -admin_menus: "Menüler" admin_blocks: "Bloklar" admin_media: "Medya" admin_settings: "Ayarlar" @@ -107,14 +106,12 @@ admin_create_user: "Kullanıcı Oluştur" admin_create_new_user: "Create New User" admin_web_server: "Web Sunucu" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menü" admin_create_new_category: "Create New Category" admin_delete_category: "Kategori Sil" admin_create_new_item: "Create New Item" admin_delete: "Sil" admin_order: "Sıra" admin_edit_category: "Kategoriyi düzenle" -admin_create_new_menu: "Yeni Menu Oluştur" admin_fieldsets: "Fieldsets" admin_template_create_new: "Yeni Şablon Oluştur" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 03671a9ba493bb2168dde57e183a35de4c224796 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:39 +0300 Subject: [PATCH 0236/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From c6d3f040175d99e6c33e158ade85373bb7e5076a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:41 +0300 Subject: [PATCH 0237/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 8cb222428b3d0eef9d39d33cd5a9e905a0844f3a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:43 +0300 Subject: [PATCH 0238/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 837b49dcc3a1d074c89156badcdaacc8a1cb3b11 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:44 +0300 Subject: [PATCH 0239/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 4110159f..2be1b003 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Создать Новую Запись" admin_date: "Дата" admin_draft: "Черновик" admin_edit: "Редактировать" -admin_menus: "Меню" admin_blocks: "Блоки" admin_media: "Медиа" admin_settings: "Настройки" @@ -107,14 +106,12 @@ admin_create_user: "Создать пользователя" admin_create_new_user: "Создать нового пользователя" admin_web_server: "Веб-сервер" admin_web_server_php_interface: "PHP интерфейс веб-сервера" -admin_menu: "Меню" admin_create_new_category: "Создать новую категорию" admin_delete_category: "Удалить категорию" admin_create_new_item: "Создать Новый Элемент" admin_delete: "Удалить" admin_order: "Счет" admin_edit_category: "Редактировать категорию" -admin_create_new_menu: "Создать новое меню" admin_fieldsets: "Наборы полей" admin_template_create_new: "Создать новый шаблон" admin_create_new_fieldset: "Создать новый набор полей" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Сниппет создан" admin_message_snippet_deleted: "Сниппет удален" admin_message_snippet_renamed: "Сниппет переименован" admin_message_snippet_duplicated: "Сниппет дублирован " -admin_message_menu_saved: "Меню сохранено" -admin_message_menu_created: "Меню создано" -admin_message_menu_deleted: "Меню удалено" -admin_message_menu_renamed: "Меню переименовано" -admin_message_menu_duplicated: "Меню дублировалось" admin_message_fieldset_saved: "Набор полей сохранен" admin_message_fieldset_created: "Набор полей создан" admin_message_fieldset_deleted: "Набор полей удален" From a71e1c6f4b9813ddad15aa55d5cd9b07c036c380 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:45 +0300 Subject: [PATCH 0240/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 614f865a6e5ddaaffde23c7c00c5065c4bd7e474 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:47 +0300 Subject: [PATCH 0241/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 4cb778be..f1388ea4 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 762e2df953220f3effb45f6421dac5e5192c24d1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:48 +0300 Subject: [PATCH 0242/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 2fbfd420ed4d3a2f2d5ee870dc879f9450da4ea8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:49 +0300 Subject: [PATCH 0243/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index c27d62d3..18614f10 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Utwórz nowy wpis" admin_date: "Data" admin_draft: "Szkic" admin_edit: "Edytuj" -admin_menus: "Menu" admin_blocks: "Bloki" admin_media: "Media" admin_settings: "Ustawienia" @@ -107,14 +106,12 @@ admin_create_user: "Utwórz użytkownika" admin_create_new_user: "Utwórz nowego użytkownika" admin_web_server: "Serwer internetowy" admin_web_server_php_interface: "Serwer internetowy do interfejsu PHP" -admin_menu: "Menu" admin_create_new_category: "Utwórz nową kategorię" admin_delete_category: "Usuń kategorię" admin_create_new_item: "Utwórz nową pozycję" admin_delete: "Kasuj" admin_order: "Kolejność" admin_edit_category: "Edytuj kategorię" -admin_create_new_menu: "Utwórz nowe menu" admin_fieldsets: "Zestawy pól" admin_template_create_new: "Utwórz nowy szablon" admin_create_new_fieldset: "Utwórz nowy zestaw pól" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Utworzono fragment kodu" admin_message_snippet_deleted: "Fragment kodu usunięty" admin_message_snippet_renamed: "Zmieniono nazwę fragmentu kodu" admin_message_snippet_duplicated: "Fragment kodu został skopiowany" -admin_message_menu_saved: "Zapisano menu" -admin_message_menu_created: "Utworzono menu" -admin_message_menu_deleted: "Menu usunięte" -admin_message_menu_renamed: "Zmieniono nazwę menu" -admin_message_menu_duplicated: "Menu zostało skopiowane" admin_message_fieldset_saved: "Zapisano zestaw pól" admin_message_fieldset_created: "Utworzono zestaw pól" admin_message_fieldset_deleted: "Zestaw pól został usunięty" From 8e4959c32d762a50e048a2400955ea921844adb1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:51 +0300 Subject: [PATCH 0244/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 7113ec9ff47f27027c2f34e30d32547d8e27d9e0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:52 +0300 Subject: [PATCH 0245/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 0bdad0f625bb1ed3319559564dd3fe854c5a3293 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:54 +0300 Subject: [PATCH 0246/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index d86dd99f..c62b64e2 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Crea nuovo elemento" admin_date: "Data" admin_draft: "Bozza" admin_edit: "Modifica" -admin_menus: "Menu" admin_blocks: "Blocchi" admin_media: "Media" admin_settings: "Impostazioni" @@ -107,14 +106,12 @@ admin_create_user: "Crea utente" admin_create_new_user: "Crea nuovo utente" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Crea una nuova categoria" admin_delete_category: "Elimina Categoria" admin_create_new_item: "Crea nuovo elemento" admin_delete: "Elimina" admin_order: "Ordina" admin_edit_category: "Modifica categoria" -admin_create_new_menu: "Crea nuovo elemento" admin_fieldsets: "Campi" admin_template_create_new: "Crea nuovo template" admin_create_new_fieldset: "Crea nuovo Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet creato" admin_message_snippet_deleted: "Snippet eliminato" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 58d90694437230ddc58e8cc491ec26dd73c81c80 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:55 +0300 Subject: [PATCH 0247/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From ab9c761a11a00f8bef94d37980ca879c8c29cdad Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:57 +0300 Subject: [PATCH 0248/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From aa3555d0e1e17c3bd5799e17dd3215ce28ad2735 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:33:58 +0300 Subject: [PATCH 0249/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 9855961b1953cccf0bad782e8311f0dc45c67563 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:00 +0300 Subject: [PATCH 0250/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 735d2ad20f53e41f50ba33200afedb4c054acce9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:01 +0300 Subject: [PATCH 0251/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index c4d3ef82..620444c4 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Neuen Eintrag erstellen" admin_date: "Datum" admin_draft: "Entwurf" admin_edit: "Bearbeiten" -admin_menus: "Menüs" admin_blocks: "Blöcke" admin_media: "Medien" admin_settings: "Einstellungen" @@ -107,14 +106,12 @@ admin_create_user: "Benutzer erstellen" admin_create_new_user: "Neuen Benutzer anlegen" admin_web_server: "Webserver" admin_web_server_php_interface: "PHP-Schnittstelle" -admin_menu: "Menü" admin_create_new_category: "Neue Kategorie anlegen" admin_delete_category: "Kategorie löschen" admin_create_new_item: "Neuen Eintrag erstellen" admin_delete: "Löschen" admin_order: "Reihenfolge" admin_edit_category: "Kategorie bearbeiten" -admin_create_new_menu: "Neues Menü erstellen" admin_fieldsets: "Fieldsets" admin_template_create_new: "Neue Vorlage erstellen" admin_create_new_fieldset: "Neues Fieldset erstellen" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Schnipsel erstellt" admin_message_snippet_deleted: "Schnipsel gelöscht" admin_message_snippet_renamed: "Schnipsel umbenannt" admin_message_snippet_duplicated: "Schnipsel dupliziert" -admin_message_menu_saved: "Menü gespeichert" -admin_message_menu_created: "Menü erstellt" -admin_message_menu_deleted: "Menü gelöscht" -admin_message_menu_renamed: "Menü umbenannt" -admin_message_menu_duplicated: "Menü dupliziert" admin_message_fieldset_saved: "Fieldset gespeichert" admin_message_fieldset_created: "Fieldset erstellt" admin_message_fieldset_deleted: "Fieldset gelöscht" From b6656e2174fc1e46a6e0fbda3517f91079833767 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:03 +0300 Subject: [PATCH 0252/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 78f232b2d5573bf275c3a4df35ca552eb7d80c29 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:04 +0300 Subject: [PATCH 0253/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 4b8e231ca248452897b7644c2b1032d3fa7e830c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:06 +0300 Subject: [PATCH 0254/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 52c0904b..0b651420 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Maak een nieuwe invoer" admin_date: "Datum" admin_draft: "Klad" admin_edit: "Bewerk" -admin_menus: "Menu's" admin_blocks: "Blokken" admin_media: "Media" admin_settings: "Instellingen" @@ -107,14 +106,12 @@ admin_create_user: "Gebruiker Aanmaken" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 593e11f9b2eb3d9a7b97225def171fe53a25e66d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:07 +0300 Subject: [PATCH 0255/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From b668ad6dc9bcd41bd5f64806d2f7b7c9eeb947cb Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:08 +0300 Subject: [PATCH 0256/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 6d2ab9c3..eb64e70b 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Datum" admin_draft: "Draft" admin_edit: "Upravit" -admin_menus: "Menu" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Nastavení" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Vytvořit nové menu" admin_fieldsets: "Datová pole" admin_template_create_new: "Vytvořit novou šablonu" admin_create_new_fieldset: "Vytvořit nové datové pole" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Výstřižek kódu vytvořen" admin_message_snippet_deleted: "Výstřižek kódu odstraněn" admin_message_snippet_renamed: "Výstřižek kódu přejmenován" admin_message_snippet_duplicated: "Výstřižek kódu duplikován" -admin_message_menu_saved: "Menu uloženo" -admin_message_menu_created: "Menu vytvořeno" -admin_message_menu_deleted: "Menu odstraněno" -admin_message_menu_renamed: "Menu přejmenováno" -admin_message_menu_duplicated: "Menu duplikováno" admin_message_fieldset_saved: "Datové pole uloženo" admin_message_fieldset_created: "Datové pole vytvořeno" admin_message_fieldset_deleted: "Datové pole odstraněno" From fc52bde2c4b868f71d77176128c154089a9dfc8b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:10 +0300 Subject: [PATCH 0257/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 9d607210..ca3c5d3c 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Stvori novi" admin_date: "Datum" admin_draft: "Skica" admin_edit: "Uredi" -admin_menus: "Menui" admin_blocks: "Blokovi" admin_media: "Media" admin_settings: "Postavke" @@ -107,14 +106,12 @@ admin_create_user: "Stvori korisnika" admin_create_new_user: "Stvori novog korisnika" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Sučelje" -admin_menu: "Menu" admin_create_new_category: "Stvori novu kategoriju" admin_delete_category: "Obriši kategoriju" admin_create_new_item: "Stvori novu stavku" admin_delete: "Obriši" admin_order: "Redoslijed" admin_edit_category: "Uredi kategoriju" -admin_create_new_menu: "Stvori novi menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Stvori novi predložak" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Svaštica je stvorena" admin_message_snippet_deleted: "Svaštica je obrisana" admin_message_snippet_renamed: "Svaštica je preimenovana" admin_message_snippet_duplicated: "Svaštica je duplicirana" -admin_message_menu_saved: "Menu je sačuvan" -admin_message_menu_created: "Menu je stvoren" -admin_message_menu_deleted: "Menu je obrisan" -admin_message_menu_renamed: "Menu je preimenovan" -admin_message_menu_duplicated: "Menu je dupliciran" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 938cef5f6a1199cf8fb98b5320739dfb8693d342 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:11 +0300 Subject: [PATCH 0258/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From cd4b05c20a39f96be35fc9516a601737e1615379 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:13 +0300 Subject: [PATCH 0259/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 4fd65a4444e44e53ee3f7ca9af6497907f743368 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:14 +0300 Subject: [PATCH 0260/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 3471305ceb8d31384c42aefe3eea33efdbdc3c4d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 2 Feb 2019 02:34:16 +0300 Subject: [PATCH 0261/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index ccb14943..2bb2c1a6 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -30,7 +30,6 @@ admin_create_new_entry: "Create New Entry" admin_date: "Date" admin_draft: "Draft" admin_edit: "Edit" -admin_menus: "Menus" admin_blocks: "Blocks" admin_media: "Media" admin_settings: "Settings" @@ -107,14 +106,12 @@ admin_create_user: "Create User" admin_create_new_user: "Create New User" admin_web_server: "Web Server" admin_web_server_php_interface: "WebServer to PHP Interface" -admin_menu: "Menu" admin_create_new_category: "Create New Category" admin_delete_category: "Delete Category" admin_create_new_item: "Create New Item" admin_delete: "Delete" admin_order: "Order" admin_edit_category: "Edit category" -admin_create_new_menu: "Create New Menu" admin_fieldsets: "Fieldsets" admin_template_create_new: "Create New Template" admin_create_new_fieldset: "Create New Fieldset" @@ -136,11 +133,6 @@ admin_message_snippet_created: "Snippet created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_menu_saved: "Menu saved" -admin_message_menu_created: "Menu created" -admin_message_menu_deleted: "Menu deleted" -admin_message_menu_renamed: "Menu renamed" -admin_message_menu_duplicated: "Menu duplicated" admin_message_fieldset_saved: "Fieldset saved" admin_message_fieldset_created: "Fieldset created" admin_message_fieldset_deleted: "Fieldset deleted" From 08a178b18dcc0d6075d343982e7d929a4f837dc5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:34:50 +0300 Subject: [PATCH 0262/1219] Admin Panel: Menus Manager - removed for now. We will try to have fields for menus inside menu sections. --- site/plugins/admin/admin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index 1f00fb22..ca292f2e 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -139,7 +139,6 @@ class Admin // Route the Uri Http::getUriSegment(1) == '' and DashboardManager::getDashboardManager(); Http::getUriSegment(1) == 'entries' and EntriesManager::getEntriesManager(); - Http::getUriSegment(1) == 'menus' and MenusManager::getMenusManager(); Http::getUriSegment(1) == 'fieldsets' and FieldsetsManager::getFieldsetsManager(); Http::getUriSegment(1) == 'templates' and TemplatesManager::getTemplatesManager(); Http::getUriSegment(1) == 'snippets' and SnippetsManager::getSnippetsManager(); From 794f9c88d4991a321ec3237924a36342644fb0d2 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:39:11 +0300 Subject: [PATCH 0263/1219] removed for now .travis - need to check it later --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6848b35d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: php -php: - - 7.1 - - 7.2 - - 7.3 -branches: - only: - - dev - - master From 1e5acbf648ad8d2d89c78acc084139db88f17aed Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:42:21 +0300 Subject: [PATCH 0264/1219] Admin Panel: Menus Manager - removed for now. We will try to have fields for menus inside menu sections. --- flextype/Menus.php | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 flextype/Menus.php diff --git a/flextype/Menus.php b/flextype/Menus.php deleted file mode 100644 index da161b8d..00000000 --- a/flextype/Menus.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @link http://flextype.org - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flextype; - -use Flextype\Component\Filesystem\Filesystem; - -class Menus -{ - /** - * Get menu - * - * Menu::get('menu-name'); - * - * @access public - * @param string $menu_name Menu name - * @return array - */ - public static function get(string $menu_name) - { - $menu_path = PATH['menus'] . '/' . $menu_name . '.yaml'; - - if (Filesystem::has($menu_path)) { - return YamlParser::decode(Filesystem::read($menu_path)); - } else { - throw new \RuntimeException("Menu {$menu_name} does not exist."); - } - } -} From 6321fdc9943f88c4ba1fc82680e9a5e0d99a5e20 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:42:55 +0300 Subject: [PATCH 0265/1219] Flextype Core: Images - code fixes and refactoring according to Scrutinizer Tests. --- flextype/Images.php | 1 - 1 file changed, 1 deletion(-) diff --git a/flextype/Images.php b/flextype/Images.php index d87f2de5..e7bbf080 100644 --- a/flextype/Images.php +++ b/flextype/Images.php @@ -13,7 +13,6 @@ namespace Flextype; use Flextype\Component\Http\Http; -use Flextype\Component\Event\Event; use Flextype\Component\Html\Html; class Images From 9ae47f2be66dc1da8396cb2918421c10684e3d49 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:43:09 +0300 Subject: [PATCH 0266/1219] Flextype Core: Snippets - code fixes and refactoring according to Scrutinizer Tests. --- flextype/Snippets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 118d0828..048627ea 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -30,7 +30,7 @@ class Snippets public static function get(string $snippet_name) { $vars = []; - + $vars['get'] = $snippet_name; return Snippets::_snippet($vars); From 7b33d4cb6171bfaf515cc0661a059c79b8709be9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:45:13 +0300 Subject: [PATCH 0267/1219] Flextype Core: Snippets - code fixes and refactoring according to Scrutinizer Tests. --- flextype/Snippets.php | 1 - 1 file changed, 1 deletion(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 048627ea..9cbcb91d 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -13,7 +13,6 @@ namespace Flextype; use Flextype\Component\Filesystem\Filesystem; -use Flextype\Component\Event\Event; class Snippets { From b2e933ac0d15b425871e9219313f9ed819fa505b Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:47:14 +0300 Subject: [PATCH 0268/1219] Admin Panel: Settings Manager - code fixes and refactoring according to Scrutinizer Tests. --- site/plugins/admin/classes/SettingsManager.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 44e25943..634722fd 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -3,19 +3,13 @@ namespace Flextype; use Flextype\Component\Arr\Arr; -use Flextype\Component\Number\Number; use Flextype\Component\I18n\I18n; use Flextype\Component\Http\Http; -use Flextype\Component\Event\Event; use Flextype\Component\Filesystem\Filesystem; -use Flextype\Component\Session\Session; use Flextype\Component\Registry\Registry; use Flextype\Component\Token\Token; -use Flextype\Component\Text\Text; -use Flextype\Component\Form\Form; use Flextype\Component\Notification\Notification; use function Flextype\Component\I18n\__; -use Gajus\Dindent\Indenter; class SettingsManager { From 982cabf9ab0a8767f99c6955c7035d722ea443c5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:48:51 +0300 Subject: [PATCH 0269/1219] Flextype Default Theme: Menus - removed for now. We will try to have fields for menus inside menu sections. --- site/themes/default/views/partials/navigation.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/site/themes/default/views/partials/navigation.php b/site/themes/default/views/partials/navigation.php index e3205954..15420344 100644 --- a/site/themes/default/views/partials/navigation.php +++ b/site/themes/default/views/partials/navigation.php @@ -8,11 +8,7 @@
From 6fc067ec0aa9027b5ed5420fd07681abd58384ca Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 02:55:23 +0300 Subject: [PATCH 0270/1219] readme updates --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ff51a6dc..748c8b76 100755 --- a/README.md +++ b/README.md @@ -3,14 +3,11 @@

Version License Total downloads Crowdin Quality Score Discord - -

+ +

# Flextype - - - Flextype is Open Source, fast and flexible file-based Content Management System. That's Easy to install, upgrade and use. Flextype provides amazing API's for plugins, themes and core developers! From 30a2c96d1405f4d22202cb8bf65551bff5c72305 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 11:41:04 +0300 Subject: [PATCH 0271/1219] Flextype Core: "flextype-components/filesystem" : "2.0.2" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 174cc9cd..841c42a1 100755 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "flextype-components/debug" : "1.0.0", "flextype-components/event" : "1.0.4", "flextype-components/errorhandler" : "1.0.5", - "flextype-components/filesystem" : "2.0.1", + "flextype-components/filesystem" : "2.0.2", "flextype-components/form" : "1.0.2", "flextype-components/i18n" : "1.2.0", "flextype-components/http" : "1.1.1", From cce0f3de1f2d907f2f794c18a3329e91577f26ca Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 2 Feb 2019 14:33:40 +0300 Subject: [PATCH 0272/1219] Admin Panel: Settings Manager - code fixes and refactoring according to Scrutinizer Tests. --- site/plugins/admin/classes/SettingsManager.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 634722fd..cc052c7b 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -3,7 +3,6 @@ namespace Flextype; use Flextype\Component\Arr\Arr; -use Flextype\Component\I18n\I18n; use Flextype\Component\Http\Http; use Flextype\Component\Filesystem\Filesystem; use Flextype\Component\Registry\Registry; @@ -18,7 +17,7 @@ class SettingsManager Registry::set('sidebar_menu_item', 'settings'); // Clear cache - if (Http::get('clear_cache')) { + if (Http::get('clear_cache') !== null && Http::get('clear_cache') == '1' && Http::get('token') !== null) { if (Token::check((Http::get('token')))) { Cache::clear(); Notification::set('success', __('admin_message_cache_files_deleted')); @@ -28,9 +27,7 @@ class SettingsManager } } - $action = Http::post('action'); - - if (isset($action) && $action == 'save-form') { + if (Http::post('action') !== null && Http::post('action') == 'save-form' && Http::post('token') !== null) { if (Token::check((Http::post('token')))) { $settings = $_POST; From c459dc5cf0ebe52c53a5d0a87aaa9daf23699bb5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 4 Feb 2019 14:14:39 +0300 Subject: [PATCH 0273/1219] Admin Panel: Entries Manager - improvements. - Code fixes and refactoring according to Scrutinizer Tests. - Fieldsets refactoring, start working on sections. --- site/plugins/admin/classes/EntriesManager.php | 457 ++++++++++-------- .../templates/content/entries/content.php | 2 +- site/themes/default/fieldsets/default.yaml | 43 +- 3 files changed, 276 insertions(+), 226 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 7c0190e4..0d94a7d7 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -33,73 +33,7 @@ class EntriesManager switch (Http::getUriSegment(2)) { case 'add': - $create_entry = Http::post('create_entry'); - - if (isset($create_entry)) { - if (Token::check((Http::post('token')))) { - $file = PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Text::safeString(Http::post('slug'), '-', true) . '/entry.html'; - - if (!Filesystem::has($file)) { - - // Get fieldset - $fieldset = YamlParser::decode(Filesystem::read(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('fieldset') . '.yaml')); - - // We need to check if template for current fieldset is exists - // if template is not exist then default template will be used! - $template_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/views/templates/' . Http::post('fieldset') . '.php'; - if (Filesystem::has($template_path)) { - $template = Http::post('fieldset'); - } else { - $template = 'default'; - } - - // Init frontmatter - $frontmatter = []; - $_frontmatter = []; - - // Define frontmatter values based on POST data - $_frontmatter['title'] = Http::post('title'); - $_frontmatter['template'] = $template; - $_frontmatter['fieldset'] = Http::post('fieldset'); - $_frontmatter['date'] = date(Registry::get('settings.date_format'), time()); - - // Define frontmatter values based on fieldset - foreach ($fieldset['fields'] as $key => $field) { - - if (isset($_frontmatter[$key])) { - $_value = $_frontmatter[$key]; - } elseif (isset($field['value'])) { - $_value = $field['value']; - } else { - $_value = ''; - } - - $frontmatter[$key] = $_value; - } - - // Delete content field from frontmatter - Arr::delete($frontmatter, 'content'); - - // Create a entry! - if (Filesystem::write( - $file, - '---' . "\n" . - YamlParser::encode(array_replace_recursive($frontmatter, $_frontmatter)) . - '---' . "\n" - )) { - Notification::set('success', __('admin_message_entry_created')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/content/entries/add') - ->assign('fieldsets', Themes::getFieldsets(false)) - ->assign('entries_list', Entries::getEntries('', 'slug')) - ->display(); + EntriesManager::addEntry(); break; case 'delete': if (Http::get('entry') != '') { @@ -126,75 +60,10 @@ class EntriesManager } break; case 'rename': - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); - - $rename_entry = Http::post('rename_entry'); - - if (isset($rename_entry)) { - if (Token::check((Http::post('token')))) { - if (!Filesystem::dirExists(PATH['entries'] . '/' . Http::post('name'))) { - if (rename( - PATH['entries'] . '/' . Http::post('entry_path_current'), - PATH['entries'] . '/' . Http::post('entry_parent') . '/' . Text::safeString(Http::post('name'), '-', true) - )) { - Notification::set('success', __('admin_message_entry_renamed')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('entry_parent')); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/content/entries/rename') - ->assign('name_current', Arr::last(explode("/", Http::get('entry')))) - ->assign('entry_path_current', Http::get('entry')) - ->assign('entry_parent', implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))) - ->assign('entry', $entry) - ->display(); + EntriesManager::renameEntry(); break; case 'type': - - $type_entry = Http::post('type_entry'); - - if (isset($type_entry)) { - if (Token::check((Http::post('token')))) { - - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); - - $content = $entry['content']; - Arr::delete($entry, 'content'); - Arr::delete($entry, 'url'); - Arr::delete($entry, 'slug'); - Arr::delete($entry, 'base_url'); - - $frontmatter = $_POST; - Arr::delete($frontmatter, 'token'); - Arr::delete($frontmatter, 'type_entry'); - Arr::delete($frontmatter, 'entry'); - $frontmatter = YamlParser::encode(array_merge($entry, $frontmatter)); - - if (Filesystem::write( - PATH['entries'] . '/' . Http::post('entry') . '/entry.html', - '---' . "\n" . - $frontmatter . "\n" . - '---' . "\n" . - $content - )) { - Notification::set('success', __('admin_message_entry_changes_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); - - Themes::view('admin/views/templates/content/entries/type') - ->assign('fieldset', $entry['fieldset']) - ->assign('fieldsets', Themes::getFieldsets()) - ->display(); + EntriesManager::typeEntry(); break; case 'move': $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); @@ -346,104 +215,106 @@ class EntriesManager return $files; } - public static function displayEntryForm(array $form, array $values = [], string $content) + public static function displayEntryForm(array $fieldsets, array $values = [], string $content) { echo Form::open(null, ['id' => 'form', 'class' => 'row']); echo Form::hidden('token', Token::generate()); echo Form::hidden('action', 'save-form'); - if (isset($form) > 0) { - foreach ($form as $element => $property) { + if (count($fieldsets['sections']) > 0) { + foreach ($fieldsets['sections'] as $section) { + foreach ($section['fields'] as $element => $property) { - // Create attributes - $property['attributes'] = Arr::keyExists($property, 'attributes') ? $property['attributes'] : []; + // Create attributes + $property['attributes'] = Arr::keyExists($property, 'attributes') ? $property['attributes'] : []; - // Create attribute class - $property['attributes']['class'] = Arr::keyExists($property, 'attributes.class') ? 'form-control ' . $property['attributes']['class'] : 'form-control'; + // Create attribute class + $property['attributes']['class'] = Arr::keyExists($property, 'attributes.class') ? 'form-control ' . $property['attributes']['class'] : 'form-control'; - // Create attribute size - $property['size'] = Arr::keyExists($property, 'size') ? $property['size'] : 'col-12'; + // Create attribute size + $property['size'] = Arr::keyExists($property, 'size') ? $property['size'] : 'col-12'; - // Create attribute value - $property['value'] = Arr::keyExists($property, 'value') ? $property['value'] : ''; + // Create attribute value + $property['value'] = Arr::keyExists($property, 'value') ? $property['value'] : ''; - $pos = strpos($element, '.'); + $pos = strpos($element, '.'); - if ($pos === false) { - $form_element_name = $element; - } else { - $form_element_name = str_replace(".", "][", "$element") . ']'; - } + if ($pos === false) { + $form_element_name = $element; + } else { + $form_element_name = str_replace(".", "][", "$element") . ']'; + } - $pos = strpos($form_element_name, ']'); + $pos = strpos($form_element_name, ']'); - if ($pos !== false) { - $form_element_name = substr_replace($form_element_name, '', $pos, strlen(']')); - } + if ($pos !== false) { + $form_element_name = substr_replace($form_element_name, '', $pos, strlen(']')); + } - // Form value - $form_value = Arr::keyExists($values, $element) ? Arr::get($values, $element) : $property['value']; + // Form value + $form_value = Arr::keyExists($values, $element) ? Arr::get($values, $element) : $property['value']; - // Form label - $form_label = Form::label($element, __($property['title'])); + // Form label + $form_label = Form::label($element, __($property['title'])); - // Form elements - switch ($property['type']) { + // Form elements + switch ($property['type']) { - // Simple text-input, for multi-line fields. - case 'textarea': - $form_element = Form::textarea($element, $form_value, $property['attributes']); - break; + // Simple text-input, for multi-line fields. + case 'textarea': + $form_element = Form::textarea($element, $form_value, $property['attributes']); + break; - // The hidden field is like the text field, except it's hidden from the content editor. - case 'hidden': - $form_element = Form::hidden($element, $form_value); - break; + // The hidden field is like the text field, except it's hidden from the content editor. + case 'hidden': + $form_element = Form::hidden($element, $form_value); + break; - // A WYSIWYG HTML field. - case 'html': - $property['attributes']['class'] .= ' js-html-editor'; - $form_element = Form::textarea($element, $form_value, $property['attributes']); - break; + // A WYSIWYG HTML field. + case 'html': + $property['attributes']['class'] .= ' js-html-editor'; + $form_element = Form::textarea($element, $form_value, $property['attributes']); + break; - // A specific WYSIWYG HTML field for entry content editing - case 'content': - $form_element = Form::textarea($element, $content, $property['attributes']); - break; + // A specific WYSIWYG HTML field for entry content editing + case 'content': + $form_element = Form::textarea($element, $content, $property['attributes']); + break; - // Selectbox field - case 'select': - $form_element = Form::select($form_element_name, $property['options'], $form_value, $property['attributes']); - break; + // Selectbox field + case 'select': + $form_element = Form::select($form_element_name, $property['options'], $form_value, $property['attributes']); + break; - // Template select field for selecting entry template - case 'template_select': - $form_element = Form::select($form_element_name, Themes::getTemplates(), $form_value, $property['attributes']); - break; + // Template select field for selecting entry template + case 'template_select': + $form_element = Form::select($form_element_name, Themes::getTemplates(), $form_value, $property['attributes']); + break; - // Visibility select field for selecting entry visibility state - case 'visibility_select': - $form_element = Form::select($form_element_name, ['draft' => __('admin_entries_draft'), 'visible' => __('admin_entries_visible'), 'hidden' => __('admin_entries_hidden')], (!empty($form_value) ? $form_value : 'visible'), $property['attributes']); - break; + // Visibility select field for selecting entry visibility state + case 'visibility_select': + $form_element = Form::select($form_element_name, ['draft' => __('admin_entries_draft'), 'visible' => __('admin_entries_visible'), 'hidden' => __('admin_entries_hidden')], (!empty($form_value) ? $form_value : 'visible'), $property['attributes']); + break; - // Media select field - case 'media_select': - $form_element = Form::select($form_element_name, EntriesManager::getMediaList(Http::get('entry'), false), $form_value, $property['attributes']); - break; + // Media select field + case 'media_select': + $form_element = Form::select($form_element_name, EntriesManager::getMediaList(Http::get('entry'), false), $form_value, $property['attributes']); + break; - // Simple text-input, for single-line fields. - default: - $form_element = Form::input($form_element_name, $form_value, $property['attributes']); - break; - } + // Simple text-input, for single-line fields. + default: + $form_element = Form::input($form_element_name, $form_value, $property['attributes']); + break; + } - // Render form elments with labels - if ($property['type'] == 'hidden') { - echo $form_element; - } else { - echo '
'; - echo $form_label . $form_element; - echo '
'; + // Render form elments with labels + if ($property['type'] == 'hidden') { + echo $form_element; + } else { + echo '
'; + echo $form_label . $form_element; + echo '
'; + } } } } @@ -516,6 +387,180 @@ class EntriesManager } } + protected static function renameEntry() + { + $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + + $rename_entry = Http::post('rename_entry'); + + if (isset($rename_entry)) { + if (Token::check((Http::post('token')))) { + if (!Filesystem::has(PATH['entries'] . '/' . Http::post('name'))) { + if (Filesystem::rename( + PATH['entries'] . '/' . Http::post('entry_path_current'), + PATH['entries'] . '/' . Http::post('entry_parent') . '/' . Text::safeString(Http::post('name'), '-', true) + )) { + Notification::set('success', __('admin_message_entry_renamed')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('entry_parent')); + } + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/content/entries/rename') + ->assign('name_current', Arr::last(explode("/", Http::get('entry')))) + ->assign('entry_path_current', Http::get('entry')) + ->assign('entry_parent', implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))) + ->assign('entry', $entry) + ->display(); + } + + protected static function typeEntry() + { + $type_entry = Http::post('type_entry'); + + if (isset($type_entry)) { + if (Token::check((Http::post('token')))) { + + $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + + $content = $entry['content']; + Arr::delete($entry, 'content'); + Arr::delete($entry, 'url'); + Arr::delete($entry, 'slug'); + Arr::delete($entry, 'base_url'); + + $frontmatter = $_POST; + Arr::delete($frontmatter, 'token'); + Arr::delete($frontmatter, 'type_entry'); + Arr::delete($frontmatter, 'entry'); + $frontmatter = YamlParser::encode(array_merge($entry, $frontmatter)); + + if (Filesystem::write( + PATH['entries'] . '/' . Http::post('entry') . '/entry.html', + '---' . "\n" . + $frontmatter . "\n" . + '---' . "\n" . + $content + )) { + Notification::set('success', __('admin_message_entry_changes_saved')); + Http::redirect(Http::getBaseUrl() . '/admin/entries?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + + Themes::view('admin/views/templates/content/entries/type') + ->assign('fieldset', $entry['fieldset']) + ->assign('fieldsets', Themes::getFieldsets()) + ->display(); + } + + protected static function addEntry() + { + $create_entry = Http::post('create_entry'); + + if (isset($create_entry)) { + if (Token::check((Http::post('token')))) { + + // Set parent entry + if (Http::post('parent_entry')) { + $parent_entry = '/' . Http::post('parent_entry'); + } else { + $parent_entry = ''; + } + + // Set new entry directory + $dir = PATH['entries'] . $parent_entry . '/' . Text::safeString(Http::post('slug'), '-', true); + + // Check if new entry directory exists + if (!Filesystem::has($dir)) { + + // Try to create directory for new entry + if (Filesystem::createDir($dir)) { + + $file = $dir . '/entry.html'; + + // Check if new entry file exists + if (!Filesystem::has($file)) { + + // Get fieldset + $fieldset = YamlParser::decode(Filesystem::read(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('fieldset') . '.yaml')); + + // We need to check if template for current fieldset is exists + // if template is not exist then default template will be used! + $template_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/views/templates/' . Http::post('fieldset') . '.php'; + if (Filesystem::has($template_path)) { + $template = Http::post('fieldset'); + } else { + $template = 'default'; + } + + // Init frontmatter + $frontmatter = []; + $default_frontmatter = []; + + // Define frontmatter values based on POST data + $default_frontmatter['title'] = Http::post('title'); + $default_frontmatter['template'] = $template; + $default_frontmatter['fieldset'] = Http::post('fieldset'); + $default_frontmatter['date'] = date(Registry::get('settings.date_format'), time()); + + // Define frontmatter values based on fieldset + foreach ($fieldset['sections'] as $section) { + foreach ($section as $key => $field) { + + // Get values from default frontmatter + if (isset($default_frontmatter[$key])) { + + $_value = $default_frontmatter[$key]; + + // Get values from fieldsets predefined field values + } elseif (isset($field['value'])) { + + $_value = $field['value']; + + // or set empty value + } else { + $_value = ''; + } + + $frontmatter[$key] = $_value; + } + } + + // Delete content field from frontmatter + Arr::delete($frontmatter, 'content'); + + // Create a entry! + if (Filesystem::write( + $file, + '---' . "\n" . + YamlParser::encode(array_replace_recursive($frontmatter, $default_frontmatter)) . + '---' . "\n" + )) { + Notification::set('success', __('admin_message_entry_created')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } + } + } + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/content/entries/add') + ->assign('fieldsets', Themes::getFieldsets(false)) + ->assign('entries_list', Entries::getEntries('', 'slug')) + ->display(); + } + /** * Upload files on the Server with several type of Validations! * diff --git a/site/plugins/admin/views/templates/content/entries/content.php b/site/plugins/admin/views/templates/content/entries/content.php index 100f8c20..cf8a4d12 100644 --- a/site/plugins/admin/views/templates/content/entries/content.php +++ b/site/plugins/admin/views/templates/content/entries/content.php @@ -43,7 +43,7 @@ Themes::view('admin/views/partials/navbar') ->display(); Themes::view('admin/views/partials/content-start')->display(); -EntriesManager::displayEntryForm($fieldset['fields'], $entry, $entry['content']); +EntriesManager::displayEntryForm($fieldset, $entry, $entry['content']); Themes::view('admin/views/partials/content-end')->display(); Themes::view('admin/views/partials/footer')->display(); diff --git a/site/themes/default/fieldsets/default.yaml b/site/themes/default/fieldsets/default.yaml index 7fd75bde..59ff43c7 100644 --- a/site/themes/default/fieldsets/default.yaml +++ b/site/themes/default/fieldsets/default.yaml @@ -1,20 +1,25 @@ title: Default -fields: - title: - title: admin_title - type: text - content: - title: admin_content - type: html - template: - title: admin_template - type: template_select - size: col-4 - visibility: - title: admin_visibility - type: visibility_select - size: col-4 - date: - title: admin_date - type: text - size: col-4 +sections: + main: + title: 'Main' + fields: + title: + title: admin_title + type: text + size: col-12 + content: + title: admin_content + type: html + size: col-12 + template: + title: admin_template + type: template_select + size: col-4 + visibility: + title: admin_visibility + type: visibility_select + size: col-4 + date: + title: admin_date + type: text + size: col-4 From 0dd42ae199cb33ec6255b4d3b4cd118d56398623 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 4 Feb 2019 14:22:24 +0300 Subject: [PATCH 0274/1219] Admin Panel: Entries Manager - improvements. - Code fixes and refactoring according to Scrutinizer Tests. --- site/plugins/admin/classes/EntriesManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 0d94a7d7..db0ed9a5 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -72,7 +72,7 @@ class EntriesManager if (isset($move_entry)) { if (Token::check((Http::post('token')))) { - if (!Filesystem::dirExists(realpath(PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Http::post('name_current')))) { + if (!Filesystem::has(realpath(PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Http::post('name_current')))) { if (rename( PATH['entries'] . '/' . Http::post('entry_path_current'), PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) From 581a86f3a55c232541dbbcecd5ab88e9c6ed3f8f Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 4 Feb 2019 14:55:04 +0300 Subject: [PATCH 0275/1219] Flextype Core: Plugins - improvements. - Code fixes and refactoring according to Scrutinizer Tests. --- flextype/Plugins.php | 103 +++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 32 deletions(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 80e16e2d..6a14c9a0 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -228,29 +228,18 @@ class Plugins */ private static function init() : void { - // Plugin cache id - $_plugins_cache_id = ''; - // Set empty plugins item Registry::set('plugins', []); // Get Plugins List $plugins_list = Filesystem::listContents(PATH['plugins']); + // Get plugins cache ID + $plugins_cache_id = Plugins::getPluginsCacheID($plugins_list); + // If Plugins List isnt empty then create plugin cache ID if (is_array($plugins_list) && count($plugins_list) > 0) { - // Go through... - foreach ($plugins_list as $plugin) { - if (Filesystem::has($_plugin_settings = PATH['plugins'] . '/' . $plugin['dirname'] . '/settings.yaml') and - Filesystem::has($_plugin_config = PATH['plugins'] . '/' . $plugin['dirname'] . '/' . $plugin['dirname'] . '.yaml')) { - $_plugins_cache_id .= filemtime($_plugin_settings) . filemtime($_plugin_config); - } - } - - // Create Unique Cache ID for Plugins - $plugins_cache_id = md5('plugins' . PATH['plugins'] . '/' . $_plugins_cache_id); - // Get plugins list from cache or scan plugins folder and create new plugins cache item if (Cache::contains($plugins_cache_id)) { Registry::set('plugins', Cache::fetch($plugins_cache_id)); @@ -290,32 +279,82 @@ class Plugins } } - // Create Dictionary - if (is_array($plugins_list) && count($plugins_list) > 0) { - foreach (Plugins::$locales as $locale => $locale_title) { - foreach ($plugins_list as $plugin) { - $language_file = PATH['plugins'] . '/' . $plugin['dirname'] . '/languages/' . $locale . '.yaml'; - if (Filesystem::has($language_file)) { - if (($content = Filesystem::read($language_file)) === false) { - throw new \RuntimeException('Load file: ' . $language_file . ' - failed!'); - } else { - I18n::add(YamlParser::decode($content), $locale); - } + Plugins::createPluginsDictionary($plugins_list); + + Plugins::includeEnabledPlugins(); + + Event::dispatch('onPluginsInitialized'); + } + } + + /** + * Create plugins dictionary + * + * @param array $plugins_list Plugins list + * @access protected + * @return void + */ + protected static function createPluginsDictionary(array $plugins_list) : void + { + if (is_array($plugins_list) && count($plugins_list) > 0) { + foreach (Plugins::$locales as $locale => $locale_title) { + foreach ($plugins_list as $plugin) { + $language_file = PATH['plugins'] . '/' . $plugin['dirname'] . '/languages/' . $locale . '.yaml'; + if (Filesystem::has($language_file)) { + if (($content = Filesystem::read($language_file)) === false) { + throw new \RuntimeException('Load file: ' . $language_file . ' - failed!'); + } else { + I18n::add(YamlParser::decode($content), $locale); } } } } + } + } - // Include enabled plugins - if (is_array(Registry::get('plugins')) && count(Registry::get('plugins')) > 0) { - foreach (Registry::get('plugins') as $plugin_name => $plugin) { - if (Registry::get('plugins.' . $plugin_name . '.enabled')) { - include_once PATH['plugins'] . '/' . $plugin_name . '/' . $plugin_name . '.php'; - } + /** + * Get plugins cache ID + * + * @param array $plugins_list Plugins list + * @access protected + * @return string + */ + protected static function getPluginsCacheID(array $plugins_list) : string + { + // Plugin cache id + $_plugins_cache_id = ''; + + // Go through... + if (is_array($plugins_list) && count($plugins_list) > 0) { + foreach ($plugins_list as $plugin) { + if (Filesystem::has($_plugin_settings = PATH['plugins'] . '/' . $plugin['dirname'] . '/settings.yaml') and + Filesystem::has($_plugin_config = PATH['plugins'] . '/' . $plugin['dirname'] . '/' . $plugin['dirname'] . '.yaml')) { + $_plugins_cache_id .= filemtime($_plugin_settings) . filemtime($_plugin_config); } } + } - Event::dispatch('onPluginsInitialized'); + // Create Unique Cache ID for Plugins + $plugins_cache_id = md5('plugins' . PATH['plugins'] . '/' . $_plugins_cache_id); + + // Return plugin cache id + return $plugins_cache_id; + } + + /** + * Include enabled plugins + * + * @access protected + * @return void + */ + protected static function includeEnabledPlugins() : void + { + if (is_array(Registry::get('plugins')) && count(Registry::get('plugins')) > 0) { + foreach (Registry::get('plugins') as $plugin_name => $plugin) { + if (Registry::get('plugins.' . $plugin_name . '.enabled')) { + include_once PATH['plugins'] . '/' . $plugin_name . '/' . $plugin_name . '.php'; + } + } } } From 5b954c7b17f7ccd142de0773fff13384adf5e82e Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Mon, 4 Feb 2019 11:58:05 +0000 Subject: [PATCH 0276/1219] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- flextype/Plugins.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 6a14c9a0..561d7966 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -294,8 +294,8 @@ class Plugins * @access protected * @return void */ - protected static function createPluginsDictionary(array $plugins_list) : void - { + protected static function createPluginsDictionary(array $plugins_list) : void + { if (is_array($plugins_list) && count($plugins_list) > 0) { foreach (Plugins::$locales as $locale => $locale_title) { foreach ($plugins_list as $plugin) { From 0f94d0dcdf20795cdae2221d1b8f04c00c6f62da Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 4 Feb 2019 17:25:43 +0300 Subject: [PATCH 0277/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 18614f10..b013e74c 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -175,6 +175,6 @@ admin_sqlite3_database: "Baza danych SQLite3" admin_sqlite3_table: "Tabela SQLite3" admin_error_name_empty_input: "Nazwa musi być wartością alfanumeryczną" admin_error_title_empty_input: "Tytuł musi być wartością alfanumeryczną" -admin_entries_visible: "Visible" -admin_entries_draft: "Draft" -admin_entries_hidden: "Hidden" +admin_entries_visible: "Widoczny" +admin_entries_draft: "Szkic" +admin_entries_hidden: "Ukryty" From 09f36525a60c80e33185c11350115110fb35f7af Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 5 Feb 2019 16:19:38 +0300 Subject: [PATCH 0278/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 52 ++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 2bb2c1a6..a32de4b3 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -1,30 +1,30 @@ --- -admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" -admin_debugging: "Debugging" -admin_email: "Email" -admin_flextype_version: "Flextype Version" -admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" -admin_entries: "Entries" -admin_extends: "Extends" -admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Help" -admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" -admin_snippets: "Snippets" -admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" -admin_add: "Add" -admin_entry_attributes: "Entry Attributes" -admin_fieldset_for_template: "Fieldset for template" +admin: "المُدير" +admin_cancel: "إلغاء" +admin_create: "إنشاء" +admin_debugging: "وضع تصحيح الأخطاء" +admin_email: "البريد الإلكتروني" +admin_flextype_version: "نسخة Flextype" +admin_information: "معلومات" +admin_installed: "المثبت" +admin_keywords: "كلمات مفتاحية" +admin_login: "تسجيل الدخول" +admin_entries: "عناصر" +admin_extends: "تمديد" +admin_plugins: "الإضافات" +admin_themes: "الثيمات" +admin_help: "المساعدة" +admin_getting_help: "الحصول على مساعدة" +admin_logout: "تسجيل الخروج" +admin_profile: "الملفّ الشّخصي" +admin_view_site: "عرض الموقع" +admin_snippets: "أكواد" +admin_not_installed: "غير مثبت" +admin_off: "إيقاف" +admin_on: "تشغيل" +admin_add: "أضف" +admin_entry_attributes: "سمات الادخال" +admin_fieldset_for_template: "مجموعة الحقول للقالب" admin_content: "Content" admin_create_new_entry: "Create New Entry" admin_date: "Date" From ec4429183f52e769c61d7714b361aa0e23bece7c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 5 Feb 2019 16:25:47 +0300 Subject: [PATCH 0279/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index a32de4b3..0ce6c5c7 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -25,30 +25,30 @@ admin_on: "تشغيل" admin_add: "أضف" admin_entry_attributes: "سمات الادخال" admin_fieldset_for_template: "مجموعة الحقول للقالب" -admin_content: "Content" -admin_create_new_entry: "Create New Entry" -admin_date: "Date" -admin_draft: "Draft" -admin_edit: "Edit" -admin_blocks: "Blocks" -admin_media: "Media" -admin_settings: "Settings" -admin_templates: "Templates" -admin_entry: "Entry" -admin_fieldset: "Fieldset" -admin_source: "Source" -admin_upload: "Upload" -admin_hidden: "Hidden" -admin_image_preview: "Image preview" -admin_move: "Move" -admin_parent_entry: "Entry parent" -admin_preview: "Preview" -admin_publish: "Publish" -admin_rename: "Rename" -admin_save_entry: "Save entry" -admin_template: "Template" -admin_title: "Title" -admin_url: "Url" +admin_content: "المحتوى" +admin_create_new_entry: "إنشاء مدخل جديد" +admin_date: "التاريخ" +admin_draft: "مسودة" +admin_edit: "تعديل" +admin_blocks: "المحظورون" +admin_media: "وسائط" +admin_settings: "الإعدادات" +admin_templates: "قوالب" +admin_entry: "مدخل" +admin_fieldset: "حقول" +admin_source: "المصدر" +admin_upload: "رفع" +admin_hidden: "مخفي" +admin_image_preview: "معاينة الصورة (Automatic Translation)" +admin_move: "نقل" +admin_parent_entry: "دخول الأصل" +admin_preview: "المعاينة" +admin_publish: "نَشر" +admin_rename: "إعادة تسمية" +admin_save_entry: "حفظ الدخل" +admin_template: "قالب" +admin_title: "العنوان" +admin_url: "الرابط" admin_view: "View" admin_visibility: "Visibility" admin_visible: "Visible" From 6c015c28a5ef0daa8ad780ab4c9171e9f832106c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 5 Feb 2019 16:25:48 +0300 Subject: [PATCH 0280/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index 2bb2c1a6..bc7acc34 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -1,33 +1,33 @@ --- admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" +admin_cancel: "Annuler" +admin_create: "Créer" admin_debugging: "Debugging" admin_email: "Email" -admin_flextype_version: "Flextype Version" +admin_flextype_version: "Version Flextype" admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" -admin_entries: "Entries" -admin_extends: "Extends" -admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Help" -admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" +admin_installed: "Installée" +admin_keywords: "Mots clés" +admin_login: "Connexion" +admin_entries: "Entrées" +admin_extends: "Etendre" +admin_plugins: "Extensions" +admin_themes: "Thèmes" +admin_help: "Aide" +admin_getting_help: "Obtenir de l'aide" +admin_logout: "Déconnexion" +admin_profile: "Profil" +admin_view_site: "Voir le site" admin_snippets: "Snippets" -admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" -admin_add: "Add" -admin_entry_attributes: "Entry Attributes" -admin_fieldset_for_template: "Fieldset for template" -admin_content: "Content" -admin_create_new_entry: "Create New Entry" -admin_date: "Date" +admin_not_installed: "Non installée" +admin_off: "Désactivé" +admin_on: "Activé" +admin_add: "Ajouter" +admin_entry_attributes: "Attributs d'entrée" +admin_fieldset_for_template: "Champ pour le modèle" +admin_content: "Contenu" +admin_create_new_entry: "Créer une nouvelle entrée" +admin_date: "La date" admin_draft: "Draft" admin_edit: "Edit" admin_blocks: "Blocks" From 9f3ea984247526ec487b98565485578e6465dd18 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Tue, 5 Feb 2019 16:35:47 +0300 Subject: [PATCH 0281/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index bc7acc34..61ac518e 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -29,12 +29,12 @@ admin_content: "Contenu" admin_create_new_entry: "Créer une nouvelle entrée" admin_date: "La date" admin_draft: "Draft" -admin_edit: "Edit" -admin_blocks: "Blocks" -admin_media: "Media" -admin_settings: "Settings" -admin_templates: "Templates" -admin_entry: "Entry" +admin_edit: "Éditer" +admin_blocks: "Blocs" +admin_media: "Média" +admin_settings: "Réglages" +admin_templates: "Modèles" +admin_entry: "Entrée" admin_fieldset: "Fieldset" admin_source: "Source" admin_upload: "Upload" From 5cbdad511427ab6733b9026d1f086306a3adecb1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 19:40:00 +0300 Subject: [PATCH 0282/1219] Flextype Core: Plugins - improvements. - Code fixes and refactoring according to Scrutinizer Tests. --- flextype/Plugins.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 561d7966..ff6c2a44 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -294,8 +294,8 @@ class Plugins * @access protected * @return void */ - protected static function createPluginsDictionary(array $plugins_list) : void - { + protected static function createPluginsDictionary(array $plugins_list) : void + { if (is_array($plugins_list) && count($plugins_list) > 0) { foreach (Plugins::$locales as $locale => $locale_title) { foreach ($plugins_list as $plugin) { From e1d96b544df402c59d3a119111b3e56608b2213c Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 21:20:42 +0300 Subject: [PATCH 0283/1219] remove cache --- site/cache/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 site/cache/.gitkeep diff --git a/site/cache/.gitkeep b/site/cache/.gitkeep deleted file mode 100755 index e69de29b..00000000 From 3ab7f49febc1334c364a032cf377ba4eabc31c99 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 21:21:30 +0300 Subject: [PATCH 0284/1219] remove accounts folder --- site/accounts/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 site/accounts/.gitkeep diff --git a/site/accounts/.gitkeep b/site/accounts/.gitkeep deleted file mode 100755 index e69de29b..00000000 From dcf6ecc9db3f577eb4a39e18b193c642da065618 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 21:21:41 +0300 Subject: [PATCH 0285/1219] remove config folder --- site/config/settings.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 site/config/settings.yaml diff --git a/site/config/settings.yaml b/site/config/settings.yaml deleted file mode 100644 index e69de29b..00000000 From f544c26b5ba0b505272ea00d3df29416a095119b Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 21:22:46 +0300 Subject: [PATCH 0286/1219] remove tmp lang files --- site/plugins/admin/languages/ar_SA.yaml | 180 ------------------------ site/plugins/admin/languages/fr_FR.yaml | 180 ------------------------ 2 files changed, 360 deletions(-) delete mode 100644 site/plugins/admin/languages/ar_SA.yaml delete mode 100644 site/plugins/admin/languages/fr_FR.yaml diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml deleted file mode 100644 index 2bb2c1a6..00000000 --- a/site/plugins/admin/languages/ar_SA.yaml +++ /dev/null @@ -1,180 +0,0 @@ ---- -admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" -admin_debugging: "Debugging" -admin_email: "Email" -admin_flextype_version: "Flextype Version" -admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" -admin_entries: "Entries" -admin_extends: "Extends" -admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Help" -admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" -admin_snippets: "Snippets" -admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" -admin_add: "Add" -admin_entry_attributes: "Entry Attributes" -admin_fieldset_for_template: "Fieldset for template" -admin_content: "Content" -admin_create_new_entry: "Create New Entry" -admin_date: "Date" -admin_draft: "Draft" -admin_edit: "Edit" -admin_blocks: "Blocks" -admin_media: "Media" -admin_settings: "Settings" -admin_templates: "Templates" -admin_entry: "Entry" -admin_fieldset: "Fieldset" -admin_source: "Source" -admin_upload: "Upload" -admin_hidden: "Hidden" -admin_image_preview: "Image preview" -admin_move: "Move" -admin_parent_entry: "Entry parent" -admin_preview: "Preview" -admin_publish: "Publish" -admin_rename: "Rename" -admin_save_entry: "Save entry" -admin_template: "Template" -admin_title: "Title" -admin_url: "Url" -admin_view: "View" -admin_visibility: "Visibility" -admin_visible: "Visible" -admin_password: "Password" -admin_php_built_on: "PHP Built On" -admin_php_version: "PHP Version" -admin_author_url: "Author url" -admin_bugs: "Bugs" -admin_description: "Description" -admin_get_more_plugins: "Get More Plugins" -admin_homepage: "Homepage" -admin_info: "Info" -admin_license: "License" -admin_status: "Status" -admin_disabled: "disabled" -admin_enabled: "enabled" -admin_version: "Version" -admin_role: "Role" -admin_save: "Save" -admin_security_check_results: "Security check results" -admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." -admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_server: "Server" -admin_site: "Site" -admin_clear_cache: "Clear cache" -admin_error404_title: "Error404 entry title" -admin_error404_description: "Error404 entry description" -admin_error404_content: "Error404 entry content" -admin_error404_template: "Error404 entry template" -admin_heading: "Settings" -admin_general: "General" -admin_error_404_page: "Error 404 page" -admin_cache: "Cache" -admin_author_email: "Author email" -admin_author_name: "Author name" -admin_site_description: "Site description" -admin_site_keywords: "Site keywords" -admin_site_robots: "Robots" -admin_site_title: "Site title" -admin_system: "System" -admin_cache_driver: "Cache driver" -admin_cache_enabled: "Cache enabled" -admin_cache_lifetime: "Cache lifetime" -admin_cache_prefix: "Cache prefix" -admin_charset: "Charset" -admin_date_format: "Date format" -admin_errors_display: "Display errors" -admin_locale: "Locale" -admin_entry_main: "Main entry" -admin_theme: "Theme" -admin_timezone: "Timezone" -admin_username: "Username" -admin_create_user: "Create User" -admin_create_new_user: "Create New User" -admin_web_server: "Web Server" -admin_web_server_php_interface: "WebServer to PHP Interface" -admin_create_new_category: "Create New Category" -admin_delete_category: "Delete Category" -admin_create_new_item: "Create New Item" -admin_delete: "Delete" -admin_order: "Order" -admin_edit_category: "Edit category" -admin_fieldsets: "Fieldsets" -admin_template_create_new: "Create New Template" -admin_create_new_fieldset: "Create New Fieldset" -admin_duplicate: "Duplicate" -admin_summary: "Summary" -admin_snippet: "Snippet" -admin_type: "Type" -admin_partial: "Partial" -admin_clone: "Clone" -admin_create_new_snippet: "Create New Snippet" -admin_create_new_template: "Create New Template" -admin_message_template_created: "Template created" -admin_message_template_deleted: "Template deleted" -admin_message_template_renamed: "Template renamed" -admin_message_template_duplicated: "Template duplicated" -admin_message_template_saved: "Template saved" -admin_message_snippet_saved: "Snippet saved" -admin_message_snippet_created: "Snippet created" -admin_message_snippet_deleted: "Snippet deleted" -admin_message_snippet_renamed: "Snippet renamed" -admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_fieldset_saved: "Fieldset saved" -admin_message_fieldset_created: "Fieldset created" -admin_message_fieldset_deleted: "Fieldset deleted" -admin_message_fieldset_renamed: "Fieldset renamed" -admin_message_fieldset_duplicated: "Fieldset duplicated" -admin_message_entry_duplicated: "Entry duplicated" -admin_message_cache_files_deleted: "Cache files deleted" -admin_message_entry_changes_saved: "Changes successfully saved" -admin_message_entry_cloned: "Entry cloned" -admin_message_entry_created: "Entry created" -admin_message_entry_deleted: "Entry deleted" -admin_message_entry_file_deleted: "File successfully deleted" -admin_message_entry_file_uploaded: "File successfully uploaded" -admin_message_entry_file_not_uploaded: "File was not uploaded" -admin_message_entry_moved: "Entry moved" -admin_message_entry_renamed: "Entry renamed" -admin_message_settings_saved: "Settings saved" -admin_message_wrong_username_password: "Wrong username or password" -admin_quality: "Quality" -admin_width: "Width" -admin_height: "Height" -admin_accept_file_types: "Accept file types" -admin_embeded_code: "Embeded Code" -admin_shortcode: "Shortcode" -admin_php_code: "PHP Code" -admin_choose_files_to_upload: "Choose file" -admin_browse_files: "Browse" -admin_copy: "Copy" -admin_admin_panel: "Admin Panel" -admin_light: "Light" -admin_dark: "Dark" -admin_name: "Name" -admin_memcached_server: "Memcached Server" -admin_memcached_port: "Memcached Port" -admin_redis_socket: "Redis Socket" -admin_redis_password: "Redis Password" -admin_redis_server: "Redis Server" -admin_redis_port: "Redis Port" -admin_sqlite3_database: "SQLite3 Database" -admin_sqlite3_table: "SQLite3 Table" -admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" -admin_entries_visible: "Visible" -admin_entries_draft: "Draft" -admin_entries_hidden: "Hidden" diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml deleted file mode 100644 index 2bb2c1a6..00000000 --- a/site/plugins/admin/languages/fr_FR.yaml +++ /dev/null @@ -1,180 +0,0 @@ ---- -admin: "Admin" -admin_cancel: "Cancel" -admin_create: "Create" -admin_debugging: "Debugging" -admin_email: "Email" -admin_flextype_version: "Flextype Version" -admin_information: "Information" -admin_installed: "Installed" -admin_keywords: "Keywords" -admin_login: "Login" -admin_entries: "Entries" -admin_extends: "Extends" -admin_plugins: "Plugins" -admin_themes: "Themes" -admin_help: "Help" -admin_getting_help: "Getting Help" -admin_logout: "Logout" -admin_profile: "Profile" -admin_view_site: "View Site" -admin_snippets: "Snippets" -admin_not_installed: "Not Installed" -admin_off: "Off" -admin_on: "On" -admin_add: "Add" -admin_entry_attributes: "Entry Attributes" -admin_fieldset_for_template: "Fieldset for template" -admin_content: "Content" -admin_create_new_entry: "Create New Entry" -admin_date: "Date" -admin_draft: "Draft" -admin_edit: "Edit" -admin_blocks: "Blocks" -admin_media: "Media" -admin_settings: "Settings" -admin_templates: "Templates" -admin_entry: "Entry" -admin_fieldset: "Fieldset" -admin_source: "Source" -admin_upload: "Upload" -admin_hidden: "Hidden" -admin_image_preview: "Image preview" -admin_move: "Move" -admin_parent_entry: "Entry parent" -admin_preview: "Preview" -admin_publish: "Publish" -admin_rename: "Rename" -admin_save_entry: "Save entry" -admin_template: "Template" -admin_title: "Title" -admin_url: "Url" -admin_view: "View" -admin_visibility: "Visibility" -admin_visible: "Visible" -admin_password: "Password" -admin_php_built_on: "PHP Built On" -admin_php_version: "PHP Version" -admin_author_url: "Author url" -admin_bugs: "Bugs" -admin_description: "Description" -admin_get_more_plugins: "Get More Plugins" -admin_homepage: "Homepage" -admin_info: "Info" -admin_license: "License" -admin_status: "Status" -admin_disabled: "disabled" -admin_enabled: "enabled" -admin_version: "Version" -admin_role: "Role" -admin_save: "Save" -admin_security_check_results: "Security check results" -admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems." -admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" -admin_server: "Server" -admin_site: "Site" -admin_clear_cache: "Clear cache" -admin_error404_title: "Error404 entry title" -admin_error404_description: "Error404 entry description" -admin_error404_content: "Error404 entry content" -admin_error404_template: "Error404 entry template" -admin_heading: "Settings" -admin_general: "General" -admin_error_404_page: "Error 404 page" -admin_cache: "Cache" -admin_author_email: "Author email" -admin_author_name: "Author name" -admin_site_description: "Site description" -admin_site_keywords: "Site keywords" -admin_site_robots: "Robots" -admin_site_title: "Site title" -admin_system: "System" -admin_cache_driver: "Cache driver" -admin_cache_enabled: "Cache enabled" -admin_cache_lifetime: "Cache lifetime" -admin_cache_prefix: "Cache prefix" -admin_charset: "Charset" -admin_date_format: "Date format" -admin_errors_display: "Display errors" -admin_locale: "Locale" -admin_entry_main: "Main entry" -admin_theme: "Theme" -admin_timezone: "Timezone" -admin_username: "Username" -admin_create_user: "Create User" -admin_create_new_user: "Create New User" -admin_web_server: "Web Server" -admin_web_server_php_interface: "WebServer to PHP Interface" -admin_create_new_category: "Create New Category" -admin_delete_category: "Delete Category" -admin_create_new_item: "Create New Item" -admin_delete: "Delete" -admin_order: "Order" -admin_edit_category: "Edit category" -admin_fieldsets: "Fieldsets" -admin_template_create_new: "Create New Template" -admin_create_new_fieldset: "Create New Fieldset" -admin_duplicate: "Duplicate" -admin_summary: "Summary" -admin_snippet: "Snippet" -admin_type: "Type" -admin_partial: "Partial" -admin_clone: "Clone" -admin_create_new_snippet: "Create New Snippet" -admin_create_new_template: "Create New Template" -admin_message_template_created: "Template created" -admin_message_template_deleted: "Template deleted" -admin_message_template_renamed: "Template renamed" -admin_message_template_duplicated: "Template duplicated" -admin_message_template_saved: "Template saved" -admin_message_snippet_saved: "Snippet saved" -admin_message_snippet_created: "Snippet created" -admin_message_snippet_deleted: "Snippet deleted" -admin_message_snippet_renamed: "Snippet renamed" -admin_message_snippet_duplicated: "Snippet duplicated" -admin_message_fieldset_saved: "Fieldset saved" -admin_message_fieldset_created: "Fieldset created" -admin_message_fieldset_deleted: "Fieldset deleted" -admin_message_fieldset_renamed: "Fieldset renamed" -admin_message_fieldset_duplicated: "Fieldset duplicated" -admin_message_entry_duplicated: "Entry duplicated" -admin_message_cache_files_deleted: "Cache files deleted" -admin_message_entry_changes_saved: "Changes successfully saved" -admin_message_entry_cloned: "Entry cloned" -admin_message_entry_created: "Entry created" -admin_message_entry_deleted: "Entry deleted" -admin_message_entry_file_deleted: "File successfully deleted" -admin_message_entry_file_uploaded: "File successfully uploaded" -admin_message_entry_file_not_uploaded: "File was not uploaded" -admin_message_entry_moved: "Entry moved" -admin_message_entry_renamed: "Entry renamed" -admin_message_settings_saved: "Settings saved" -admin_message_wrong_username_password: "Wrong username or password" -admin_quality: "Quality" -admin_width: "Width" -admin_height: "Height" -admin_accept_file_types: "Accept file types" -admin_embeded_code: "Embeded Code" -admin_shortcode: "Shortcode" -admin_php_code: "PHP Code" -admin_choose_files_to_upload: "Choose file" -admin_browse_files: "Browse" -admin_copy: "Copy" -admin_admin_panel: "Admin Panel" -admin_light: "Light" -admin_dark: "Dark" -admin_name: "Name" -admin_memcached_server: "Memcached Server" -admin_memcached_port: "Memcached Port" -admin_redis_socket: "Redis Socket" -admin_redis_password: "Redis Password" -admin_redis_server: "Redis Server" -admin_redis_port: "Redis Port" -admin_sqlite3_database: "SQLite3 Database" -admin_sqlite3_table: "SQLite3 Table" -admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)" -admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" -admin_entries_visible: "Visible" -admin_entries_draft: "Draft" -admin_entries_hidden: "Hidden" From 1666d4bffce6175af7448b55c969d891a0cc1f62 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 21:37:38 +0300 Subject: [PATCH 0287/1219] "flextype-components/assets" : "1.0.3" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 841c42a1..6f3151b4 100755 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "symfony/yaml": "4.2.2", "thunderer/shortcode": "0.7.0", "flextype-components/arr" : "1.2.5", - "flextype-components/assets" : "1.0.1", + "flextype-components/assets" : "1.0.3", "flextype-components/cookie" : "1.2.0", "flextype-components/date" : "1.0.0", "flextype-components/debug" : "1.0.0", From 9fa1718c4ebf4942b9652bb7ff29bf1569001cf4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 21:57:39 +0300 Subject: [PATCH 0288/1219] revert folders back --- site/accounts/.gitkeep | 0 site/config/settings.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 site/accounts/.gitkeep create mode 100644 site/config/settings.yaml diff --git a/site/accounts/.gitkeep b/site/accounts/.gitkeep new file mode 100755 index 00000000..e69de29b diff --git a/site/config/settings.yaml b/site/config/settings.yaml new file mode 100644 index 00000000..e69de29b From b2c3b0d21b0555ca43ac6f103d99f7ec38f2bc41 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 22:02:58 +0300 Subject: [PATCH 0289/1219] Flextype Core: Default theme - using new Assets Component 1.0.3 --- site/themes/default/views/partials/head.php | 12 +++++++----- site/themes/default/views/partials/tail.php | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/site/themes/default/views/partials/head.php b/site/themes/default/views/partials/head.php index f29ca669..31c408a1 100755 --- a/site/themes/default/views/partials/head.php +++ b/site/themes/default/views/partials/head.php @@ -18,12 +18,14 @@ - - - + + 0): ?> + + + + - - + diff --git a/site/themes/default/views/partials/tail.php b/site/themes/default/views/partials/tail.php index c1e9ccc3..f143e3fe 100755 --- a/site/themes/default/views/partials/tail.php +++ b/site/themes/default/views/partials/tail.php @@ -1,9 +1,12 @@ - - - + + 0): ?> + + + + - + From d3b7555d1148efb817d3a2abf52cf5f233627b17 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 5 Feb 2019 22:19:10 +0300 Subject: [PATCH 0290/1219] "flextype-components/notification" : "1.0.2" --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6f3151b4..da9e27f3 100755 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "flextype-components/http" : "1.1.1", "flextype-components/html" : "1.0.0", "flextype-components/number" : "1.0.0", - "flextype-components/notification" : "1.0.1", + "flextype-components/notification" : "1.0.2", "flextype-components/registry" : "1.1.0", "flextype-components/session" : "1.1.1", "flextype-components/token" : "1.2.0", From 30e31c8481dd9fc8c2f903484d15c2914eff9af0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 6 Feb 2019 00:15:01 +0300 Subject: [PATCH 0291/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 2be1b003..84be77b3 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -175,6 +175,6 @@ admin_sqlite3_database: "База данных SQLite3" admin_sqlite3_table: "Таблица SQLite3" admin_error_name_empty_input: "Название должно быть буквенно-цифровое значение (от 1 симв.)" admin_error_title_empty_input: "Заголовок должен иметь буквенно-цифровое значение (от 1 симв.)" -admin_entries_visible: "Visible" -admin_entries_draft: "Draft" -admin_entries_hidden: "Hidden" +admin_entries_visible: "Видимый" +admin_entries_draft: "Черновик" +admin_entries_hidden: "Скрытый" From 08bee3cf46326b36ac7f16ed67f0531c8c5c7df7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 6 Feb 2019 00:15:05 +0300 Subject: [PATCH 0292/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index ea9f1eaa..780791ed 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -1,30 +1,30 @@ --- admin: "Адмін" admin_cancel: "Скасувати" -admin_create: "Create" -admin_debugging: "Debugging" +admin_create: "Створити" +admin_debugging: "Відлагодження" admin_email: "E-mail" admin_flextype_version: "Версія Flextype" admin_information: "Інформація" admin_installed: "Встановлений" admin_keywords: "Ключові Слова" admin_login: "Логін" -admin_entries: "Entries" -admin_extends: "Extends" +admin_entries: "Записи" +admin_extends: "Розширення" admin_plugins: "Плагіни" admin_themes: "Тема оформлення" admin_help: "Допомога" -admin_getting_help: "Getting Help" +admin_getting_help: "Отримати довідку" admin_logout: "Вихід" admin_profile: "Профіль" admin_view_site: "Переглянути сайт" admin_snippets: "Сніпети" -admin_not_installed: "Not Installed" +admin_not_installed: "Не встановлено" admin_off: "Вимкнено" admin_on: "Увімкнуто" admin_add: "Додати" -admin_entry_attributes: "Entry Attributes" -admin_fieldset_for_template: "Fieldset for template" +admin_entry_attributes: "Атрибути запису" +admin_fieldset_for_template: "Набір полів для шаблону" admin_content: "Контент" admin_create_new_entry: "Create New Entry" admin_date: "Дата" From 9b1f78070350fa00bf1af5086d62164df48f23da Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 6 Feb 2019 00:25:38 +0300 Subject: [PATCH 0293/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 780791ed..d81a3a5e 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -26,22 +26,22 @@ admin_add: "Додати" admin_entry_attributes: "Атрибути запису" admin_fieldset_for_template: "Набір полів для шаблону" admin_content: "Контент" -admin_create_new_entry: "Create New Entry" +admin_create_new_entry: "Створити новий запис" admin_date: "Дата" -admin_draft: "Draft" +admin_draft: "Чернетка" admin_edit: "Редагувати" admin_blocks: "Блоки" admin_media: "Медіа-файли" admin_settings: "Налаштування" admin_templates: "Шаблони" -admin_entry: "Entry" -admin_fieldset: "Fieldset" -admin_source: "Source" +admin_entry: "Запис" +admin_fieldset: "Набір полів" +admin_source: "Джерело" admin_upload: "Завантажити" -admin_hidden: "Hidden" +admin_hidden: "Прихований" admin_image_preview: "Попередній перегляд" -admin_move: "Move" -admin_parent_entry: "Entry parent" +admin_move: "Перемістити" +admin_parent_entry: "Запис батьків" admin_preview: "Попередній перегляд" admin_publish: "Опублікувати" admin_rename: "Перейменувати" @@ -94,15 +94,15 @@ admin_cache_driver: "Кеш драйвера" admin_cache_enabled: "Кеш включений" admin_cache_lifetime: "Тривалість зберігання кешу" admin_cache_prefix: "Кеш префікс" -admin_charset: "Charset" +admin_charset: "Кодування" admin_date_format: "Формат дати" admin_errors_display: "Відображати помилки" admin_locale: "Мова" -admin_entry_main: "Main entry" +admin_entry_main: "Основний запис" admin_theme: "Тема оформлення" admin_timezone: "Часовий пояс" admin_username: "Користувач" -admin_create_user: "Create User" +admin_create_user: "Створити користувача" admin_create_new_user: "Create New User" admin_web_server: "Веб-сервер" admin_web_server_php_interface: "Веб-сервер для PHP інтерфейс" From e02f1af8738fd168167b846056e2c62bb095b5d6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 6 Feb 2019 00:39:38 +0300 Subject: [PATCH 0294/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index d81a3a5e..843bf392 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -103,7 +103,7 @@ admin_theme: "Тема оформлення" admin_timezone: "Часовий пояс" admin_username: "Користувач" admin_create_user: "Створити користувача" -admin_create_new_user: "Create New User" +admin_create_new_user: "Створити нового користувача" admin_web_server: "Веб-сервер" admin_web_server_php_interface: "Веб-сервер для PHP інтерфейс" admin_create_new_category: "Створити нову категорію" @@ -112,11 +112,11 @@ admin_create_new_item: "Створити новий елемент" admin_delete: "Видалити" admin_order: "Замовлення" admin_edit_category: "Редагувати категорію" -admin_fieldsets: "Fieldsets" -admin_template_create_new: "Create New Template" -admin_create_new_fieldset: "Create New Fieldset" +admin_fieldsets: "Набір полів" +admin_template_create_new: "Створити новий шаблон" +admin_create_new_fieldset: "Створити новий набір полів" admin_duplicate: "Створити копію" -admin_summary: "Summary" +admin_summary: "Підсумок" admin_snippet: "Сніпети" admin_type: "Тип" admin_partial: "Частково" @@ -125,7 +125,7 @@ admin_create_new_snippet: "Створити новий сніпет тут" admin_create_new_template: "Створити новий шаблон" admin_message_template_created: "Шаблон створений" admin_message_template_deleted: "Шаблон видалено" -admin_message_template_renamed: "Template renamed" +admin_message_template_renamed: "Шаблон перейменовано" admin_message_template_duplicated: "Шаблон дублюється" admin_message_template_saved: "Шаблон збережено" admin_message_snippet_saved: "Snippet saved" From 29bc8441c0867739c3d08e5bd6eada75249aaca6 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 14:16:16 +0300 Subject: [PATCH 0295/1219] Flextype Core: New Site class with some decoupled Entries methods --- flextype/Entries.php | 150 ------------------------------------- flextype/Flextype.php | 4 +- flextype/Site.php | 170 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+), 152 deletions(-) create mode 100644 flextype/Site.php diff --git a/flextype/Entries.php b/flextype/Entries.php index d971fcb3..f1626f34 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -20,127 +20,6 @@ use Flextype\Component\Registry\Registry; class Entries { - /** - * An instance of the Entry class - * - * @var object - * @access private - */ - private static $instance = null; - - /** - * Current entry data array - * - * @var array - * @access private - */ - private static $entry = []; - - /** - * Private clone method to enforce singleton behavior. - * - * @access private - */ - private function __clone() - { - } - - /** - * Private wakeup method to enforce singleton behavior. - * - * @access private - */ - private function __wakeup() - { - } - - /** - * Private construct method to enforce singleton behavior. - * - * @access private - */ - private function __construct() - { - Entries::init(); - } - - /** - * Init Entry - * - * @access private - * @return void - */ - private static function init() : void - { - Entries::processCurrentEntry(); - } - - /** - * Process Current Entry - * - * @access private - * @return void - */ - private static function processCurrentEntry() : void - { - // Event: The entry is not processed and not sent to the display. - Event::dispatch('onCurrentEntryBeforeProcessed'); - - // Set current requested entry data to global $entry array - Entries::$entry = Entries::getEntry(Http::getUriString()); - - // Event: The entry has been fully processed and not sent to the display. - Event::dispatch('onCurrentEntryBeforeDisplayed'); - - // Display entry for current requested url - Entries::displayCurrentEntry(); - - // Event: The entry has been fully processed and sent to the display. - Event::dispatch('onCurrentEntryAfterProcessed'); - } - - /** - * Get current entry - * - * $entry = Entries::getCurrentEntry(); - * - * @access public - * @return array - */ - public static function getCurrentEntry() : array - { - return Entries::$entry; - } - - /** - * Update current entry - * - * Entries::updateCurrentEntry(['title' => "New Title"]); - * - * @access public - * @param array $data Data - * @return void - */ - public static function updateCurrentEntry(array $data) : void - { - Entries::$entry = $data; - } - - /** - * Update current entry field - * - * Entries::updateCurrentEntryField('title', "New Title"); - * - * @access public - * @param string $path Array path - * @param mixed $value Value to set - * @return void - */ - public static function updateCurrentEntryField(string $path, $value) : void - { - Arr::set(Entries::$entry, $path, $value); - } - /** * Get entry * @@ -402,33 +281,4 @@ class Entries return $_entry; } } - - /** - * Display current entry - * - * @access private - * @return void - */ - private static function displayCurrentEntry() : void - { - Http::setRequestHeaders('Content-Type: text/html; charset=' . Registry::get('settings.charset')); - Themes::view(empty(Entries::$entry['template']) ? 'templates/default' : 'templates/' . Entries::$entry['template']) - ->assign('entry', Entries::$entry, true) - ->display(); - } - - /** - * Get the Content instance. - * - * @access public - * @return object - */ - public static function getInstance() - { - if (is_null(Entries::$instance)) { - Entries::$instance = new self; - } - - return Entries::$instance; - } } diff --git a/flextype/Flextype.php b/flextype/Flextype.php index eef334fb..7a878fdd 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -105,8 +105,8 @@ class Flextype // Get Plugins Instance Plugins::getInstance(); - // Get Entries Instance - Entries::getInstance(); + // Get Site Instance + Site::getInstance(); // Flush (send) the output buffer and turn off output buffering ob_end_flush(); diff --git a/flextype/Site.php b/flextype/Site.php new file mode 100644 index 00000000..780b59d3 --- /dev/null +++ b/flextype/Site.php @@ -0,0 +1,170 @@ + + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; + +use Flextype\Component\Http\Http; +use Flextype\Component\Event\Event; +use Flextype\Component\Registry\Registry; + +class Site +{ + /** + * An instance of the Site class + * + * @var object + * @access private + */ + private static $instance = null; + + /** + * Current site entry data array + * + * @var array + * @access private + */ + private static $entry = []; + + /** + * Private clone method to enforce singleton behavior. + * + * @access private + */ + private function __clone() + { + } + + /** + * Private wakeup method to enforce singleton behavior. + * + * @access private + */ + private function __wakeup() + { + } + + /** + * Private construct method to enforce singleton behavior. + * + * @access private + */ + private function __construct() + { + Site::init(); + } + + /** + * Init Entry + * + * @access private + * @return void + */ + private static function init() : void + { + Site::processCurrentPage(); + } + + /** + * Process Current Page + * + * @access private + * @return void + */ + private static function processCurrentPage() : void + { + // Event: The entry is not processed and not sent to the display. + Event::dispatch('onCurrentEntryBeforeProcessed'); + + // Set current requested entry data to global $entry array + Site::$entry = Entries::getEntry(Http::getUriString()); + + // Event: The entry has been fully processed and not sent to the display. + Event::dispatch('onCurrentEntryBeforeDisplayed'); + + // Display entry for current requested url + Site::displayCurrentPage(); + + // Event: The entry has been fully processed and sent to the display. + Event::dispatch('onCurrentEntryAfterProcessed'); + } + + /** + * Get current entry + * + * $entry = Site::getCurrentEntry(); + * + * @access public + * @return array + */ + public static function getCurrentEntry() : array + { + return Site::$entry; + } + + /** + * Update current entry + * + * Site::updateCurrentEntry(['title' => "New Title"]); + * + * @access public + * @param array $data Data + * @return void + */ + public static function updateCurrentEntry(array $data) : void + { + Site::$entry = $data; + } + + /** + * Update current entry field + * + * Site::updateCurrentEntryField('title', "New Title"); + * + * @access public + * @param string $path Array path + * @param mixed $value Value to set + * @return void + */ + public static function updateCurrentEntryField(string $path, $value) : void + { + Arr::set(Site::$entry, $path, $value); + } + + /** + * Display Current Page + * + * @access private + * @return void + */ + private static function displayCurrentPage() : void + { + Http::setRequestHeaders('Content-Type: text/html; charset=' . Registry::get('settings.charset')); + Themes::view(empty(Site::$entry['template']) ? 'templates/default' : 'templates/' . Site::$entry['template']) + ->assign('entry', Site::$entry, true) + ->display(); + } + + /** + * Get the Content instance. + * + * @access public + * @return object + */ + public static function getInstance() + { + if (is_null(Site::$instance)) { + Site::$instance = new self; + } + + return Site::$instance; + } +} From 10eba2cad983ab5f0230277ffad03d64875a941a Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 14:20:49 +0300 Subject: [PATCH 0296/1219] Flextype Core: New Site class with some decoupled Entries methods --- flextype/Site.php | 1 + 1 file changed, 1 insertion(+) diff --git a/flextype/Site.php b/flextype/Site.php index 780b59d3..9d652c35 100644 --- a/flextype/Site.php +++ b/flextype/Site.php @@ -12,6 +12,7 @@ namespace Flextype; +use Flextype\Component\Arr\Arr; use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; use Flextype\Component\Registry\Registry; From 4b06aa3e393466a5963a2dc9fc649bdba49bcef9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 16:20:15 +0300 Subject: [PATCH 0297/1219] Flextype Core: Entries - new method has() - added. --- flextype/Entries.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index f1626f34..b64ae20c 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -281,4 +281,15 @@ class Entries return $_entry; } } + + /** + * Check whether entry exists. + * + * @param string $entry Entry to find + * @return bool + */ + public static function has(string $entry) : bool + { + return Filesystem::has(PATH['entries'] . '/' . $entry . '/entry.html'); + } } From 27837fe711d798538e26a77665268e1e10f78f3f Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 16:26:05 +0300 Subject: [PATCH 0298/1219] Flextype Core: Entries - new method delete() - added. --- flextype/Entries.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index b64ae20c..8294ed26 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -282,10 +282,21 @@ class Entries } } + /** + * Delete entry. + * + * @param string $entry Entry + * @return bool True on success, false on failure. + */ + public static function delete(string $entry) : bool + { + return Filesystem::delete(PATH['entries'] . '/' . $entry); + } + /** * Check whether entry exists. * - * @param string $entry Entry to find + * @param string $entry Entry * @return bool */ public static function has(string $entry) : bool From 31666b6b975de965388a4d5238d1fdf44cb10192 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 16:46:10 +0300 Subject: [PATCH 0299/1219] Flextype Core: Entries - new method create() - added. --- flextype/Entries.php | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index 8294ed26..e0c1b214 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -282,6 +282,38 @@ class Entries } } + /** + * Create entry + * + * @param string $entry Entry + * @param string $data Data + * @return bool + */ + public static create(string $entry, string $data) : bool + { + $entry_dir = PATH['entries'] . '/' . $entry; + + // Check if new entry directory exists + if (!Filesystem::has($entry_dir)) { + + // Try to create directory for new entry + if (Filesystem::createDir($entry_dir)) { + + $entry_file = $entry_dir . '/entry.html'; + + // Check if new entry file exists + if (!Filesystem::has($entry_file)) { + return Filesystem::write($entry_file, $data); + } + + } else { + return false; + } + } else { + return false; + } + } + /** * Delete entry. * From 7af9ab1665656c715433000de57380a66a8483e3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 16:47:33 +0300 Subject: [PATCH 0300/1219] Flextype Core: Entries - new method update() - added. --- flextype/Entries.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index e0c1b214..69a688ac 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -282,6 +282,24 @@ class Entries } } + /** + * Update entry + * + * @param string $entry Entry + * @param string $data Data + * @return bool + */ + public static update(string $entry, string $data) : bool + { + $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; + + if (Filesystem::has($entry_file)) { + return Filesystem::write($entry_file, $data); + } else { + return false; + } + } + /** * Create entry * From 16b9ba2ebaea0023c865f3d8d9f73b65133028d2 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 17:01:59 +0300 Subject: [PATCH 0301/1219] Flextype Core: Entries - new method rename() - added. --- flextype/Entries.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index 69a688ac..cb1534d4 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -282,6 +282,18 @@ class Entries } } + /** + * Rename entry. + * + * @param string $entry Entry + * @param string $new_entry New entry + * @return bool True on success, false on failure. + */ + public static function rename(string $entry, string $new_entry) : bool + { + return rename($entry, $new_entry); + } + /** * Update entry * From dd535435bb3e9c11dcf87188145cbb7bc9e1f877 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 17:12:21 +0300 Subject: [PATCH 0302/1219] Flextype Core: Entries - new method update() - added. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index cb1534d4..354c7e87 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -301,7 +301,7 @@ class Entries * @param string $data Data * @return bool */ - public static update(string $entry, string $data) : bool + public static function update(string $entry, string $data) : bool { $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; From f558a67e83294a90aab99034a4f6b175a81f67ef Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 17:23:40 +0300 Subject: [PATCH 0303/1219] Flextype Core: Entries - method getEntry() - refactoring. --- flextype/Entries.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 354c7e87..44f5b1d3 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -26,21 +26,21 @@ class Entries * $entry = Entries::getEntry('projects'); * * @access public - * @param string $url Page url. + * @param string $entry Entry * @param bool $raw Parse content or raw content without parsing. * @param bool $hidden Get hidden entries. * @return array */ - public static function getEntry(string $url = '', bool $raw = false, bool $hidden = false) + public static function getEntry(string $entry = '', bool $raw = false, bool $hidden = false) : array { - // Init Entry - $entry = []; + // Init entry data + $data = []; // If $url is empty then set path for default main entry - if ($url === '') { + if ($entry === '') { $file_path = PATH['entries'] . '/' . Registry::get('settings.entries.main') . '/entry.html'; } else { - $file_path = PATH['entries'] . '/' . $url . '/entry.html'; + $file_path = PATH['entries'] . '/' . $entry . '/entry.html'; } // If entry exist @@ -56,27 +56,27 @@ class Entries // Get raw entry if $raw is true if ($raw) { - $entry = Entries::processEntry($file_path, true); + $data = Entries::processEntry($file_path, true); } else { - $entry = Entries::processEntry($file_path); + $data = Entries::processEntry($file_path); // Don't proccess 404 entry if we want to get hidden entry. if ($hidden === false) { // Get 404 entry if entry is not published if (isset($entry['visibility']) && ($entry['visibility'] === 'draft' || $entry['visibility'] === 'hidden')) { - $entry = Entries::getError404Entry(); + $data = Entries::getError404Entry(); } } } - Cache::save($entry_cache_id, $entry); + Cache::save($entry_cache_id, $data); } } else { - $entry = Entries::getError404Entry(); + $data = Entries::getError404Entry(); } - return $entry; + return $data; } /** From 45b25cb10d94dbac722290ca9d87c2b7544d97ce Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 17:24:09 +0300 Subject: [PATCH 0304/1219] Flextype Core: Entries - new method create() - fixes. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 44f5b1d3..0fdb2911 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -319,7 +319,7 @@ class Entries * @param string $data Data * @return bool */ - public static create(string $entry, string $data) : bool + public static function create(string $entry, string $data) : bool { $entry_dir = PATH['entries'] . '/' . $entry; From 6299b311bb626ca8216593f92adf8cf2fefec48e Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 7 Feb 2019 17:59:34 +0300 Subject: [PATCH 0305/1219] Flextype Core: Entries - new method copy() - added. --- flextype/Entries.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index 0fdb2911..9ce78216 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -355,6 +355,19 @@ class Entries return Filesystem::delete(PATH['entries'] . '/' . $entry); } + /** + * Copy entry(s) + * + * @param string $entry Entry + * @param string $new_entry New entry + * @param bool $recursive Recursive copy entries. + * @return bool True on success, false on failure. + */ + public static function copy(string $entry, string $new_entry, bool $recursive = false) : bool + { + return Filesystem::copy($entry, $new_entry, $recursive); + } + /** * Check whether entry exists. * From 50b7aa44787344deb212b32ed3b5977a9a0dca01 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 8 Feb 2019 19:55:05 +0300 Subject: [PATCH 0306/1219] Flextype Core: Entries - new method fetch() and fetchAll() - added. --- flextype/Entries.php | 46 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 9ce78216..09f7ed70 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -282,6 +282,40 @@ class Entries } } + /** + * Fetch entry + * + * @param string $entry Entry + * @return string|false The entry contents or false on failure. + */ + public static function fetch(string $entry) + { + $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; + + if (Filesystem::has($entry_file)) { + return YamlParser::decode(Filesystem::read($entry_file)); + } else { + return false; + } + } + + /** + * Fetch entry + * + * @param string $entry Entry + * @return string|false The entry contents or false on failure. + */ + public static function fetchAll(string $entry) + { + $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; + + if (Filesystem::has($entry_file)) { + return YamlParser::decode(Filesystem::read($entry_file)); + } else { + return false; + } + } + /** * Rename entry. * @@ -298,15 +332,15 @@ class Entries * Update entry * * @param string $entry Entry - * @param string $data Data + * @param array $data Data * @return bool */ - public static function update(string $entry, string $data) : bool + public static function update(string $entry, array $data) : bool { $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; if (Filesystem::has($entry_file)) { - return Filesystem::write($entry_file, $data); + return Filesystem::write($entry_file, YamlParser::encode($data)); } else { return false; } @@ -316,10 +350,10 @@ class Entries * Create entry * * @param string $entry Entry - * @param string $data Data + * @param array $data Data * @return bool */ - public static function create(string $entry, string $data) : bool + public static function create(string $entry, array $data) : bool { $entry_dir = PATH['entries'] . '/' . $entry; @@ -333,7 +367,7 @@ class Entries // Check if new entry file exists if (!Filesystem::has($entry_file)) { - return Filesystem::write($entry_file, $data); + return Filesystem::write($entry_file, YamlParser::encode($data)); } } else { From d2424bf1cd60e9f96d72643fd75954de2d715587 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Fri, 8 Feb 2019 20:44:14 +0300 Subject: [PATCH 0307/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 7a32c4f2..d720dfbb 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -34,7 +34,7 @@ admin_blocks: "Bloklar" admin_media: "Medya" admin_settings: "Ayarlar" admin_templates: "Şablonlar" -admin_entry: "Entry" +admin_entry: "Girdi" admin_fieldset: "Fieldset" admin_source: "Kaynak" admin_upload: "Yükle" @@ -45,7 +45,7 @@ admin_parent_entry: "Entry parent" admin_preview: "Önizleme" admin_publish: "Yayınla" admin_rename: "Yeniden Adlandır" -admin_save_entry: "Save entry" +admin_save_entry: "Girdiyi kaydet" admin_template: "Şablon" admin_title: "Başlık" admin_url: "Url" @@ -53,7 +53,7 @@ admin_view: "Görüntüle" admin_visibility: "Görünürlük" admin_visible: "Görünürlük" admin_password: "Şifre" -admin_php_built_on: "PHP Built On" +admin_php_built_on: "PHP üzerinde oluşturulan" admin_php_version: "PHP Versiyon" admin_author_url: "Yazar url" admin_bugs: "Hatalar" @@ -74,7 +74,7 @@ admin_security_check_results_htaccess: "The Flextype .htaccess file has been fou admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions.
You can do this on unix systems with: chmod a-w :path" admin_server: "Sunucu" admin_site: "Site" -admin_clear_cache: "Clear cache" +admin_clear_cache: "Önbelleği temizle" admin_error404_title: "Error404 entry title" admin_error404_description: "Error404 entry description" admin_error404_content: "Error404 entry content" @@ -118,7 +118,7 @@ admin_create_new_fieldset: "Create New Fieldset" admin_duplicate: "Kopyala" admin_summary: "Summary" admin_snippet: "Snippet" -admin_type: "Type" +admin_type: "Tür" admin_partial: "Partial" admin_clone: "Klonla" admin_create_new_snippet: "Create New Snippet" From 08cc07817c9761bec2cb84b132465e4d3d743805 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 00:12:50 +0300 Subject: [PATCH 0308/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 09f7ed70..f1688f7d 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -293,7 +293,15 @@ class Entries $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; if (Filesystem::has($entry_file)) { - return YamlParser::decode(Filesystem::read($entry_file)); + if ($entry = Filesystem::read($entry_file)) { + if ($entry_decoded = YamlParser::decode($entry)) { + return $entry_decoded; + } else { + return false; + } + } else { + return false; + } } else { return false; } From 63cc3351ba56ee172554219da969f34410f55119 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 18:26:02 +0300 Subject: [PATCH 0309/1219] Flextype Core: Site - use new Entries::fetch() method --- flextype/Site.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/flextype/Site.php b/flextype/Site.php index 9d652c35..85e8fe28 100644 --- a/flextype/Site.php +++ b/flextype/Site.php @@ -85,8 +85,34 @@ class Site // Event: The entry is not processed and not sent to the display. Event::dispatch('onCurrentEntryBeforeProcessed'); + // Get uri + $uri = Http::getUriString(); + + // If uri is empty then it is main page else use entry uri + if ($uri === '') { + $entry_uri = Registry::get('settings.entries.main'); + } else { + $entry_uri = $uri; + } + + // Get entry body + $entry_body = Entries::fetch($entry_uri); + + // If entry body is not false + if ($entry_body) { + + // Get 404 page if entry is not published + if (isset($entry_body['visibility']) && ($entry_body['visibility'] === 'draft' || $entry_body['visibility'] === 'hidden')) { + $entry = Site::getError404Page(); + } else { + $entry = $entry_body; + } + } else { + $entry = Site::getError404Page(); + } + // Set current requested entry data to global $entry array - Site::$entry = Entries::getEntry(Http::getUriString()); + Site::$entry = $entry; // Event: The entry has been fully processed and not sent to the display. Event::dispatch('onCurrentEntryBeforeDisplayed'); @@ -98,6 +124,26 @@ class Site Event::dispatch('onCurrentEntryAfterProcessed'); } + + /** + * Get Error404 entry + * + * @return array + */ + private static function getError404Page() : array + { + Http::setResponseStatus(404); + + $entry = []; + + $entry['title'] = Registry::get('settings.entries.error404.title'); + $entry['description'] = Registry::get('settings.entries.error404.description'); + $entry['content'] = Registry::get('settings.entries.error404.content'); + $entry['template'] = Registry::get('settings.entries.error404.template'); + + return $entry; + } + /** * Get current entry * From 8b772954944d601e071fc5b74018509a24373f13 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 18:31:29 +0300 Subject: [PATCH 0310/1219] Flextype Core: YamlParser - improve encode method flags Default flags: Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE --- flextype/parsers/YamlParser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/parsers/YamlParser.php b/flextype/parsers/YamlParser.php index a327df43..6a49a518 100644 --- a/flextype/parsers/YamlParser.php +++ b/flextype/parsers/YamlParser.php @@ -52,7 +52,7 @@ class YamlParser { * * @var int */ - public static $flag = 16; + public static $flag = Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK|Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE; /** * Dumps a PHP value to a YAML string. @@ -67,7 +67,7 @@ class YamlParser { * * @return string A YAML string representing the original PHP value */ - public static function encode($input, int $inline = 5, int $indent = 2, int $flags = 16) : string + public static function encode($input, int $inline = 5, int $indent = 2, int $flags = Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK|Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE) : string { try { return Yaml::dump( From d5b028e214a4066fdb16e54e003af2a513b71108 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 18:46:32 +0300 Subject: [PATCH 0311/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index f1688f7d..356930ee 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -293,8 +293,13 @@ class Entries $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; if (Filesystem::has($entry_file)) { - if ($entry = Filesystem::read($entry_file)) { - if ($entry_decoded = YamlParser::decode($entry)) { + if ($entry_body = Filesystem::read($entry_file)) { + if ($entry_decoded = YamlParser::decode($entry_body)) { + + // Create default entry items + $entry_decoded['date'] = $entry_decoded['date'] ?? date(Registry::get('settings.date_format'), Filesystem::getTimestamp($entry_file)); + $entry_decoded['slug'] = $entry_decoded['slug'] ?? $entry; + return $entry_decoded; } else { return false; From e66f242aef4aee0a1b0fb1619a0dc5bdbadbf576 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 18:57:08 +0300 Subject: [PATCH 0312/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 356930ee..de2dc1b1 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -286,7 +286,7 @@ class Entries * Fetch entry * * @param string $entry Entry - * @return string|false The entry contents or false on failure. + * @return array|false The entry contents or false on failure. */ public static function fetch(string $entry) { @@ -320,13 +320,7 @@ class Entries */ public static function fetchAll(string $entry) { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; - if (Filesystem::has($entry_file)) { - return YamlParser::decode(Filesystem::read($entry_file)); - } else { - return false; - } } /** From 5ad80dd3bc78081f83f28c5a11ce97de46875df7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 19:16:55 +0300 Subject: [PATCH 0313/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index de2dc1b1..fc05710e 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -292,20 +292,35 @@ class Entries { $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; + $entry_cache_id = md5('entry' . $entry_file . Filesystem::getTimestamp($entry_file)); + if (Filesystem::has($entry_file)) { - if ($entry_body = Filesystem::read($entry_file)) { - if ($entry_decoded = YamlParser::decode($entry_body)) { - - // Create default entry items - $entry_decoded['date'] = $entry_decoded['date'] ?? date(Registry::get('settings.date_format'), Filesystem::getTimestamp($entry_file)); - $entry_decoded['slug'] = $entry_decoded['slug'] ?? $entry; + // Try to get the entry from cache + if (Cache::contains($entry_cache_id)) { + if ($entry_decoded = Cache::fetch($entry_cache_id)) { return $entry_decoded; } else { return false; } } else { - return false; + + if ($entry_body = Filesystem::read($entry_file)) { + if ($entry_decoded = YamlParser::decode($entry_body)) { + + // Create default entry items + $entry_decoded['date'] = $entry_decoded['date'] ?? date(Registry::get('settings.date_format'), Filesystem::getTimestamp($entry_file)); + $entry_decoded['slug'] = $entry_decoded['slug'] ?? $entry; + + Cache::save($entry_cache_id, $entry_decoded); + + return $entry_decoded; + } else { + return false; + } + } else { + return false; + } } } else { return false; @@ -320,7 +335,7 @@ class Entries */ public static function fetchAll(string $entry) { - + return $entry; } /** From 21d38990c1c8e54e49b3374e08e0fc5e01a05e0a Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 19:27:31 +0300 Subject: [PATCH 0314/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index fc05710e..26e9584b 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -292,7 +292,7 @@ class Entries { $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; - $entry_cache_id = md5('entry' . $entry_file . Filesystem::getTimestamp($entry_file)); + $entry_cache_id = md5('entry' . $entry_file . (Filesystem::getTimestamp($entry_file) ? Filesystem::getTimestamp($entry_file) : '')); if (Filesystem::has($entry_file)) { From 58d1bd513a3b0d861c619232710706b575b23c10 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 19:33:06 +0300 Subject: [PATCH 0315/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 26e9584b..6eb679fd 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -292,7 +292,7 @@ class Entries { $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; - $entry_cache_id = md5('entry' . $entry_file . (Filesystem::getTimestamp($entry_file) ? Filesystem::getTimestamp($entry_file) : '')); + $entry_cache_id = md5('entry' . $entry_file . ((Filesystem::getTimestamp($entry_file) === false) ? '' : Filesystem::getTimestamp($entry_file))); if (Filesystem::has($entry_file)) { From aff6a064477adac6de9b8ef580e0d40a5ce8c601 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 22:37:44 +0300 Subject: [PATCH 0316/1219] Flextype Core: Entries - method fetchAll() - improvements. --- flextype/Entries.php | 65 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 6eb679fd..2bbdb910 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -328,14 +328,69 @@ class Entries } /** - * Fetch entry + * Fetch entries * - * @param string $entry Entry - * @return string|false The entry contents or false on failure. + * @param string $etnry Entry + * @param string $order_by Order by specific entry field. + * @param string $order_type Order type: DESC or ASC + * @param int $offset Offset + * @param int $length Length + * @return array The entries */ - public static function fetchAll(string $entry) + public static function fetchAll(string $entry, string $order_by = 'date', string $order_type = 'DESC', int $offset = null, int $length = null) : array { - return $entry; + // Entries array where founded entries will stored + $entries = []; + + // Сache id + $cache_id = ''; + + // Entries path + $entries_path = PATH['entries'] . '/' . $entry; + + // Get entries list + $entries_list = Filesystem::listContents($entries_path); + + // Create entries cached id + foreach ($entries_list as $current_entry) { + if (strpos($current_entry['path'], $entry . '/entry.html') !== false) { + // ignore ... + } else { + if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.html')) { + $cache_id .= md5('entries' . $current_entry['path'] . $current_entry['timestamp']); + } + } + } + + if (Cache::contains($cache_id)) { + $entries = Cache::fetch($cache_id); + } else { + + // Create entries array from entries list and ignore current requested entry + foreach ($entries_list as $current_entry) { + if (strpos($current_entry['path'], $entry . '/entry.html') !== false) { + // ignore ... + } else { + if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.html')) { + $entries[$current_entry['dirname']] = Entries::fetch($entry . '/' . $current_entry['dirname']); + } + } + } + + Cache::save($cache_id, $entries); + } + + // Sort and Slice entries if $raw === false + if (count($entries) > 0) { + + $entries = Arr::sort($entries, $order_by, $order_type); + + if ($offset !== null && $length !== null) { + $entries = array_slice($entries, $offset, $length); + } + } + + return $entries; } /** From 64d60db6bda3520e50ff29791b423f8b7fc2b8d3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 23:01:26 +0300 Subject: [PATCH 0317/1219] Flextype Core: Entries - method create() - improvements. --- flextype/Entries.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 2bbdb910..774741f2 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -445,8 +445,9 @@ class Entries // Check if new entry file exists if (!Filesystem::has($entry_file)) { return Filesystem::write($entry_file, YamlParser::encode($data)); + } else { + return false; } - } else { return false; } From 2a39ad8d0c96a4f54d00a34901e789c90ebbdf77 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 23:24:08 +0300 Subject: [PATCH 0318/1219] Flextype Core: Entries - method fetch() - improvements. --- flextype/Entries.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 774741f2..f7213b0d 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -292,13 +292,14 @@ class Entries { $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; - $entry_cache_id = md5('entry' . $entry_file . ((Filesystem::getTimestamp($entry_file) === false) ? '' : Filesystem::getTimestamp($entry_file))); if (Filesystem::has($entry_file)) { + $cache_id = md5('entry' . $entry_file . ((Filesystem::getTimestamp($entry_file) === false) ? '' : Filesystem::getTimestamp($entry_file))); + // Try to get the entry from cache - if (Cache::contains($entry_cache_id)) { - if ($entry_decoded = Cache::fetch($entry_cache_id)) { + if (Cache::contains($cache_id)) { + if ($entry_decoded = Cache::fetch($cache_id)) { return $entry_decoded; } else { return false; @@ -312,7 +313,13 @@ class Entries $entry_decoded['date'] = $entry_decoded['date'] ?? date(Registry::get('settings.date_format'), Filesystem::getTimestamp($entry_file)); $entry_decoded['slug'] = $entry_decoded['slug'] ?? $entry; - Cache::save($entry_cache_id, $entry_decoded); + // Apply Shortcodes for each entry fields + foreach ($entry_decoded as $key => $_entry_decoded) { + $entry_decoded[$key] = Shortcodes::process($_entry_decoded); + } + + // Save to cache + Cache::save($cache_id, $entry_decoded); return $entry_decoded; } else { @@ -322,6 +329,7 @@ class Entries return false; } } + } else { return false; } From 7339ec7b89556d1bb79d6691b57baebd0b4203f9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 23:27:37 +0300 Subject: [PATCH 0319/1219] Flextype Core: Entries - method fetchAll() - improvements. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index f7213b0d..956f83b3 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -365,7 +365,7 @@ class Entries // ignore ... } else { if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.html')) { - $cache_id .= md5('entries' . $current_entry['path'] . $current_entry['timestamp']); + $cache_id .= md5('entries' . $current_entry['path'] . Filesystem::getTimestamp($current_entry['path'] . '/entry.html')); } } } From c68db128e4402e4e05e55f3fc2ef333a7ffdb9e8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 13 Feb 2019 23:38:35 +0300 Subject: [PATCH 0320/1219] Admin Panel: Settings Manager - using new Entries::fetchAll() method. --- site/plugins/admin/classes/SettingsManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index cc052c7b..534f5fa4 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -63,7 +63,7 @@ class SettingsManager $entries = []; - foreach (Entries::getEntries('', 'date', 'DESC') as $entry) { + foreach (Entries::fetchAll('', 'date', 'DESC') as $entry) { $entries[$entry['slug']] = $entry['title']; } From deab7f41ae0a09738b0bfe85b29118b263f26f10 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 11:06:08 +0300 Subject: [PATCH 0321/1219] Admin Panel: Entries Manager - using new Entries API. --- site/plugins/admin/classes/EntriesManager.php | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index db0ed9a5..faf445bd 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -66,7 +66,7 @@ class EntriesManager EntriesManager::typeEntry(); break; case 'move': - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + $entry = Entries::processEntry(Http::get('entry')); $move_entry = Http::post('move_entry'); @@ -86,7 +86,7 @@ class EntriesManager } } - $_entries_list = Entries::getEntries('', 'slug'); + $_entries_list = Entries::fetchAll('', 'slug'); $entries_list['/'] = '/'; foreach ($_entries_list as $_entry) { if ($_entry['slug'] != '') { @@ -105,7 +105,7 @@ class EntriesManager ->display(); break; case 'edit': - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + $entry = Entries::fetch(Http::get('entry')); if (Http::get('media') && Http::get('media') == 'true') { EntriesManager::processFilesManager(); @@ -146,29 +146,25 @@ class EntriesManager if (isset($action) && $action == 'save-form') { if (Token::check((Http::post('token')))) { - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); - Arr::delete($entry, 'content'); - Arr::delete($entry, 'url'); - Arr::delete($entry, 'slug'); - Arr::delete($entry, 'base_url'); - $frontmatter = $_POST; - Arr::delete($frontmatter, 'token'); - Arr::delete($frontmatter, 'action'); - Arr::delete($frontmatter, 'content'); - $frontmatter = YamlParser::encode(array_merge($entry, $frontmatter)); + $data = $_POST; - $content = Http::post('content'); - $content = (isset($content)) ? $indenter->indent($content) : ''; + Arr::delete($data, 'token'); + Arr::delete($data, 'action'); + Arr::delete($data, 'content'); + + if (Http::post('content') !== null) { + Arr::set($data, 'content', $indenter->indent(Http::post('content'))); + } else { + Arr::set($data, 'content', ''); + } + + if (Entries::update(Http::get('entry'), $data)) { + Notification::set('success', __('admin_message_entry_changes_saved')); + } else { + Notification::set('error', __('admin_message_entry_changes_not_saved')); + } - Filesystem::write( - PATH['entries'] . '/' . Http::get('entry') . '/entry.html', - '---' . "\n" . - $frontmatter . "\n" . - '---' . "\n" . - $content - ); - Notification::set('success', __('admin_message_entry_changes_saved')); Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry')); } } @@ -191,7 +187,7 @@ class EntriesManager default: if (!Http::get('add')) { Themes::view('admin/views/templates/content/entries/list') - ->assign('entries_list', Entries::getEntries($query, 'date', 'DESC')) + ->assign('entries_list', Entries::fetchAll($query, 'date', 'DESC')) ->display(); } break; @@ -389,7 +385,7 @@ class EntriesManager protected static function renameEntry() { - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + $entry = Entries::fetch(Http::get('entry')); $rename_entry = Http::post('rename_entry'); @@ -424,7 +420,7 @@ class EntriesManager if (isset($type_entry)) { if (Token::check((Http::post('token')))) { - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + $entry = Entries::fetch(Http::get('entry')); $content = $entry['content']; Arr::delete($entry, 'content'); @@ -453,7 +449,7 @@ class EntriesManager } } - $entry = Entries::processEntry(PATH['entries'] . '/' . Http::get('entry') . '/entry.html', false, true); + $entry = Entries::fetch(Http::get('entry')); Themes::view('admin/views/templates/content/entries/type') ->assign('fieldset', $entry['fieldset']) @@ -557,7 +553,7 @@ class EntriesManager Themes::view('admin/views/templates/content/entries/add') ->assign('fieldsets', Themes::getFieldsets(false)) - ->assign('entries_list', Entries::getEntries('', 'slug')) + ->assign('entries_list', Entries::fetchAll('', 'slug')) ->display(); } From f6179c121d95f7864254643160ded7bbd0fb1dd5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 11:15:39 +0300 Subject: [PATCH 0322/1219] Flextype Core: Entries - cleanup and refactoring. --- flextype/Entries.php | 264 +------------------------------------------ 1 file changed, 2 insertions(+), 262 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 956f83b3..0aca038d 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -20,267 +20,6 @@ use Flextype\Component\Registry\Registry; class Entries { - /** - * Get entry - * - * $entry = Entries::getEntry('projects'); - * - * @access public - * @param string $entry Entry - * @param bool $raw Parse content or raw content without parsing. - * @param bool $hidden Get hidden entries. - * @return array - */ - public static function getEntry(string $entry = '', bool $raw = false, bool $hidden = false) : array - { - // Init entry data - $data = []; - - // If $url is empty then set path for default main entry - if ($entry === '') { - $file_path = PATH['entries'] . '/' . Registry::get('settings.entries.main') . '/entry.html'; - } else { - $file_path = PATH['entries'] . '/' . $entry . '/entry.html'; - } - - // If entry exist - if (Filesystem::has($file_path)) { - $entry_cache_id = md5('entry' . $file_path . filemtime($file_path) . (($raw === true) ? 'true' : 'false') . (($hidden === true) ? 'true' : 'false')); - - // Try to get the entry from cache - if (Cache::contains($entry_cache_id)) { - if ($_entry = Cache::fetch($entry_cache_id)) { - $entry = $_entry; - } - } else { - - // Get raw entry if $raw is true - if ($raw) { - $data = Entries::processEntry($file_path, true); - } else { - $data = Entries::processEntry($file_path); - - // Don't proccess 404 entry if we want to get hidden entry. - if ($hidden === false) { - - // Get 404 entry if entry is not published - if (isset($entry['visibility']) && ($entry['visibility'] === 'draft' || $entry['visibility'] === 'hidden')) { - $data = Entries::getError404Entry(); - } - } - } - - Cache::save($entry_cache_id, $data); - } - } else { - $data = Entries::getError404Entry(); - } - - return $data; - } - - /** - * Get entries - * - * // Get list of subentries for entry 'projects' - * $entries = Entries::getEntries('projects'); - * - * // Get list of subentries for entry 'projects' and order by date and order type DESC - * $entries = Entries::getEntries('projects', false, 'date', 'DESC'); - * - * @access public - * @param string $url Page url. - * @param string $order_by Order by specific entry field. - * @param string $order_type Order type: DESC or ASC - * @param int $offset Offset - * @param int $length Length - * @param bool $multilevel Get nested entries or not. - * @param bool $raw Parse content or raw content without parsing. - * @return array - */ - public static function getEntries(string $url = '', string $order_by = 'date', string $order_type = 'DESC', int $offset = null, int $length = null, bool $multilevel = false, bool $raw = false) : array - { - // if $url is empty then set path for defined main entry - if ($url === '') { - $file_path = PATH['entries'] . '/'; - } else { - $file_path = PATH['entries'] . '/' . $url; - } - - // Pages array where founded entries will stored - $entries = []; - - // Pages cache id - $entry_cache_id = ''; - - // Get entries for $url - // If $url is empty then we want to have a list of entries for /entries dir. - if ($url === '') { - - // Get entries list - $entries_list = Filesystem::listContents($file_path); - - // Create entries cached id - foreach ($entries_list as $entry) { - if ($entry['type'] == 'dir' && Filesystem::has($entry['path'] . '/entry.html')) { - $entry_cache_id .= md5('entries' . $entry['path'] . $entry['timestamp'] . (($raw === true) ? 'true' : 'false') . (($multilevel === true) ? 'true' : 'false') . $order_by . $order_type . $offset . $length); - } - } - - if (Cache::contains($entry_cache_id)) { - $entries = Cache::fetch($entry_cache_id); - } else { - // Create entries array from entries list - foreach ($entries_list as $entry) { - if ($entry['type'] == 'dir' && Filesystem::has($entry['path'] . '/entry.html')) { - $entries[$entry['dirname']] = Entries::processEntry($entry['path'] . '/entry.html', $raw); - } - } - - Cache::save($entry_cache_id, $entries); - } - } else { - - // Get entries list - $entries_list = Filesystem::listContents($file_path); - - // Create entries cached id - foreach ($entries_list as $entry) { - if (strpos($entry['path'], $url . '/entry.html') !== false) { - // ignore ... - } else { - if ($entry['type'] == 'dir' && Filesystem::has($entry['path'] . '/entry.html')) { - $entry_cache_id .= md5('entries' . $entry['path'] . $entry['timestamp'] . (($raw === true) ? 'true' : 'false') . $order_by . $order_type . $offset . $length); - } - } - } - - if (Cache::contains($entry_cache_id)) { - $entries = Cache::fetch($entry_cache_id); - } else { - // Create entries array from entries list and ignore current requested entry - foreach ($entries_list as $entry) { - if (strpos($entry['path'], $url . '/entry.html') !== false) { - // ignore ... - } else { - if ($entry['type'] == 'dir' && Filesystem::has($entry['path'] . '/entry.html')) { - $entries[$entry['dirname']] = Entries::processEntry($entry['path'] . '/entry.html', $raw); - } - } - } - - Cache::save($entry_cache_id, $entries); - } - } - - // Sort and Slice entries if $raw === false - if (count($entries) > 0) { - if (!$raw) { - $entries = Arr::sort($entries, $order_by, $order_type); - - if ($offset !== null && $length !== null) { - $entries = array_slice($entries, $offset, $length); - } - } - } - - // Return entries array - return $entries; - } - - /** - * Get Error404 entry - * - * @return array - */ - private static function getError404Entry() : array - { - Http::setResponseStatus(404); - - $entry = []; - - $entry['title'] = Registry::get('settings.entries.error404.title'); - $entry['description'] = Registry::get('settings.entries.error404.description'); - $entry['content'] = Registry::get('settings.entries.error404.content'); - $entry['template'] = Registry::get('settings.entries.error404.template'); - - return $entry; - } - - /** - * Process entry - * - * $entry = Entries::processEntry(PATH['entries'] . '/home/entry.html'); - * - * @access public - * @param string $file_path File path - * @param bool $raw Raw or not raw content - * @param bool $ignore_content Ignore content parsing - * @return array|string - */ - public static function processEntry(string $file_path, bool $raw = false, bool $ignore_content = false) - { - // Init Entry - $entry = ''; - - // Get entry from file - if ($entry_content = Filesystem::read($file_path)) { - $entry = $entry_content; - } - - $entry = trim($entry); - - // Return raw entry if $raw is true - if ($raw) { - return $entry; - } else { - - // Create $entry_frontmatter and $entry_content - $entry = FrontmatterParser::parse($entry); - $entry_frontmatter = $entry['matter']; - $entry_content = $entry['body']; - - // Process $entry_frontmatter with YAML and Shortcodes parsers - $_entry = YamlParser::decode(Shortcodes::process($entry_frontmatter)); - - // Create entry url item - $url = str_replace(PATH['entries'], Http::getBaseUrl(), $file_path); - $url = str_replace('entry.html', '', $url); - $url = str_replace('.html', '', $url); - $url = str_replace('\\', '/', $url); - $url = str_replace('///', '/', $url); - $url = str_replace('//', '/', $url); - $url = str_replace('http:/', 'http://', $url); - $url = str_replace('https:/', 'https://', $url); - $url = rtrim($url, '/'); - $_entry['url'] = $url; - - // Create entry slug item - $url = str_replace(Http::getBaseUrl(), '', $url); - $url = ltrim($url, '/'); - $url = rtrim($url, '/'); - $_entry['slug'] = str_replace(Http::getBaseUrl(), '', $url); - - // Create entry base url - $_entry['base_url'] = Http::getBaseUrl() . '/site/entries/'; - - // Create entry template item - $_entry['template'] = $_entry['template'] ?? 'default'; - - // Create entry date item - $_entry['date'] = $_entry['date'] ?? date(Registry::get('settings.date_format'), filemtime($file_path)); - - // Create entry content item with $entry_content - if ($ignore_content) { - $_entry['content'] = $entry_content; - } else { - $_entry['content'] = Shortcodes::process($entry_content); - } - - // Return entry - return $_entry; - } - } /** * Fetch entry @@ -311,7 +50,8 @@ class Entries // Create default entry items $entry_decoded['date'] = $entry_decoded['date'] ?? date(Registry::get('settings.date_format'), Filesystem::getTimestamp($entry_file)); - $entry_decoded['slug'] = $entry_decoded['slug'] ?? $entry; + $entry_decoded['slug'] = $entry_decoded['slug'] ?? ltrim(rtrim($entry, '/'), '/'); + // Apply Shortcodes for each entry fields foreach ($entry_decoded as $key => $_entry_decoded) { From cd2aed30768489a661a956737f63c2f377cc6344 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 12:43:37 +0300 Subject: [PATCH 0323/1219] Flextype Core: Entries - cleanup and refactoring. --- flextype/Entries.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 0aca038d..d8670a42 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -13,9 +13,7 @@ namespace Flextype; use Flextype\Component\Arr\Arr; -use Flextype\Component\Http\Http; use Flextype\Component\Filesystem\Filesystem; -use Flextype\Component\Event\Event; use Flextype\Component\Registry\Registry; class Entries From ded55bc8c97c6f4a385c56fdaee2e7f1a0fcaf05 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 12:46:24 +0300 Subject: [PATCH 0324/1219] Admin Panel: Entries Manager - using new Entries API. --- site/plugins/admin/views/templates/content/entries/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/content/entries/list.php b/site/plugins/admin/views/templates/content/entries/list.php index ca941bed..b0e16d38 100644 --- a/site/plugins/admin/views/templates/content/entries/list.php +++ b/site/plugins/admin/views/templates/content/entries/list.php @@ -33,7 +33,7 @@ - + 0): ?> () From dcb60c20c66d806421844f9421b7d44d97efa28d Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 12:47:03 +0300 Subject: [PATCH 0325/1219] Admin Panel: translates updates --- site/plugins/admin/languages/en_US.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index 3f65de6b..c4c2807d 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -140,6 +140,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From b36d4e0a1cf3d9a3d5535c5c5bbb72f5a032feae Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:00 +0300 Subject: [PATCH 0326/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 9bf78baeb52065ccd92d2eeca618d694364cedcf Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:02 +0300 Subject: [PATCH 0327/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From cf1611f2f1056a64e0870f3ba8d74a0a4767a1c1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:04 +0300 Subject: [PATCH 0328/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 843bf392..d94490cd 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 84447231570188d0c532335c481cb55afc25f838 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:06 +0300 Subject: [PATCH 0329/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index d720dfbb..7b55a57d 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From f7426a59a6573dd9de268c8887b0036210848b97 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:08 +0300 Subject: [PATCH 0330/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 450ae0c8b85933a4f8901dd9e83d4c4d57c9eae5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:10 +0300 Subject: [PATCH 0331/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 647114a2ea57799a2c87af7cdf8204411a219ab4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:12 +0300 Subject: [PATCH 0332/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From d6a3dec7729bebb93a994148f24d16ef0528fb1f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:13 +0300 Subject: [PATCH 0333/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 84be77b3..dc42a8ff 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Набор полей удален" admin_message_entry_duplicated: "Запись дублировалась" admin_message_cache_files_deleted: "Файлы кеша удалены" admin_message_entry_changes_saved: "Изменения успешно сохранены" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Запись клонировалась" admin_message_entry_created: "Запись создана" admin_message_entry_deleted: "Запись удалена" From 1cb325f8a2eb8bee36f5229ff3b92ef62e37142e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:15 +0300 Subject: [PATCH 0334/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 08f87824401da259998665bb9cc77e3b877fabe2 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:16 +0300 Subject: [PATCH 0335/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index f1388ea4..41aa20f2 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 74bd4cf73e758264ac093faf933aac179056f0d6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:18 +0300 Subject: [PATCH 0336/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 8cfc8ae6b5bc74a455523e7c9dbcd976aee6843e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:20 +0300 Subject: [PATCH 0337/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index b013e74c..04969a7e 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Zestaw pól został skopiowany" admin_message_entry_duplicated: "Wpis został skopiowany" admin_message_cache_files_deleted: "Pliki pamięci podręcznej zostały usunięte" admin_message_entry_changes_saved: "Zmiany zostały pomyślnie zapisane" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Wpis został skopiowany" admin_message_entry_created: "Utworzono wpis" admin_message_entry_deleted: "Wpis został usunięty" From 6a6074b8f87ad9c360cced48765fcc8e3a669fc7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:22 +0300 Subject: [PATCH 0338/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 2da4feec6e5987944d72577c7a6ef302406cce64 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:24 +0300 Subject: [PATCH 0339/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 4a1cb3b997257b574ad76b1f99ffd2bb88248395 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:25 +0300 Subject: [PATCH 0340/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index c62b64e2..8addd7b3 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 9478e80ed72c6b736d54b78c58b153ac95d18f35 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:27 +0300 Subject: [PATCH 0341/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 31e659bf..8f4c8c2e 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" @@ -177,4 +178,4 @@ admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 char admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" admin_entries_visible: "Visible" admin_entries_draft: "Draft" -admin_entries_hidden: "Hidden" \ No newline at end of file +admin_entries_hidden: "Hidden" From 0443f9606411b7c67192357df2cbf72ff0c001d5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:28 +0300 Subject: [PATCH 0342/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 7b8f3e72b8a09748a441031237abbefc3b1b750e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:30 +0300 Subject: [PATCH 0343/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 4a3e627cc4ee0427d06cc6f6a91f956775c8d638 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:31 +0300 Subject: [PATCH 0344/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 8b3a9aab9bb86bd5761c4ff9a48c87163eb74f9b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:33 +0300 Subject: [PATCH 0345/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 620444c4..63afdb5a 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset dupliziert" admin_message_entry_duplicated: "Eintrag dupliziert" admin_message_cache_files_deleted: "Cache Dateien gelöscht" admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Eintrag dupliziert" admin_message_entry_created: "Eintrag erstellt" admin_message_entry_deleted: "Eintrag gelöscht" From 33e1de26b7b9b3dc5bac030046fa84c3e0686d68 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:34 +0300 Subject: [PATCH 0346/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index 79548262..bbffc19e 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" @@ -177,4 +178,4 @@ admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 char admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)" admin_entries_visible: "Visible" admin_entries_draft: "Draft" -admin_entries_hidden: "Hidden" \ No newline at end of file +admin_entries_hidden: "Hidden" From 5e7ab09f171bb122d8ce1b33b5b4be0c7f955e1f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:35 +0300 Subject: [PATCH 0347/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From c5f6500209455689162c725ff4d14c2cc47a1f58 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:37 +0300 Subject: [PATCH 0348/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 0b651420..9cd41679 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 120ea52ef5983a0f13bacbcaa847ed44dd207ef4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:39 +0300 Subject: [PATCH 0349/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 9a6f872356ef5e64e931c7a98019988cdcc926e1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:40 +0300 Subject: [PATCH 0350/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index eb64e70b..7fa68746 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Datové pole duplikováno" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Soubory cache byly odstraněny" admin_message_entry_changes_saved: "Změny byly uloženy" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Stránka byla duplikována" admin_message_entry_created: "Stránka byla vytvořena" admin_message_entry_deleted: "Stránka byla odstraněna" From a28cb4e9f600be0682cc23ee43db682973d8caa2 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:41 +0300 Subject: [PATCH 0351/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index ca3c5d3c..60b30f60 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Unos je dupliciran" admin_message_cache_files_deleted: "Cache fajlovi su obrisani" admin_message_entry_changes_saved: "Promjene su uspješno sačuvane" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Unos je kloniran" admin_message_entry_created: "Unos je stvoren" admin_message_entry_deleted: "Unos je obrisan" From 9acec895acae8f114db66a4d37fd6a591777ccbe Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:43 +0300 Subject: [PATCH 0352/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 4b203c99c5a7f377093fdd94e84a0c595e048e9a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:45 +0300 Subject: [PATCH 0353/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From c0485b811312d85ce81bddf4d9138b09c33e0ba9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:47 +0300 Subject: [PATCH 0354/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From 9022861c5107ecda2a9b095d3599dfcd45e564e0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Thu, 14 Feb 2019 13:06:48 +0300 Subject: [PATCH 0355/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index 2bb2c1a6..f10091fc 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -141,6 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" +admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" From d60dca809f85f9f34fb42d4a23ba90e14ad52d5b Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 20:33:00 +0300 Subject: [PATCH 0356/1219] Flextype Core: Entries - using new improved entries format. --- site/entries/about/entry.html | 10 ----- site/entries/about/entry.yaml | 7 ++++ .../{entry.html => entry.yaml} | 37 +++++++++---------- .../{entry.html => entry.yaml} | 7 +--- site/entries/blog/entry.html | 6 --- site/entries/blog/entry.yaml | 3 ++ .../{entry.html => entry.yaml} | 7 +--- .../{entry.html => entry.yaml} | 7 +--- .../{entry.html => entry.yaml} | 7 +--- site/entries/home/entry.html | 17 --------- site/entries/home/entry.yaml | 15 ++++++++ 11 files changed, 50 insertions(+), 73 deletions(-) delete mode 100644 site/entries/about/entry.html create mode 100644 site/entries/about/entry.yaml rename site/entries/blog/allamco-laboris-nisi-ut-aliquip/{entry.html => entry.yaml} (58%) rename site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/{entry.html => entry.yaml} (68%) delete mode 100644 site/entries/blog/entry.html create mode 100644 site/entries/blog/entry.yaml rename site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/{entry.html => entry.yaml} (68%) rename site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/{entry.html => entry.yaml} (68%) rename site/entries/blog/ullamco-laboris-nisi-ut-aliquip/{entry.html => entry.yaml} (52%) delete mode 100644 site/entries/home/entry.html create mode 100644 site/entries/home/entry.yaml diff --git a/site/entries/about/entry.html b/site/entries/about/entry.html deleted file mode 100644 index ce8d7dca..00000000 --- a/site/entries/about/entry.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: About -image: lilia.jpg -template: about -fieldset: about -date: 'December 26 2018 10:26:04' - ---- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\ No newline at end of file diff --git a/site/entries/about/entry.yaml b/site/entries/about/entry.yaml new file mode 100644 index 00000000..9d179106 --- /dev/null +++ b/site/entries/about/entry.yaml @@ -0,0 +1,7 @@ +title: About +image: lilia.jpg +template: about +fieldset: about +content: | +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

diff --git a/site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.html b/site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.yaml similarity index 58% rename from site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.html rename to site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.yaml index 0d9c8f70..2056dc6c 100644 --- a/site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.html +++ b/site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.yaml @@ -1,24 +1,21 @@ ---- title: 'Allamco laboris nisi ut aliquip nisi ut aliquip' summary: '

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

' template: blog-post fieldset: blog-post -date: 'December 25 2018 23:16:47' - ---- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-
-

- -
-

-
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-
-

- -
-

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+content: | +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+

+ +
+

+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+

+ +
+

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

diff --git a/site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.html b/site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.yaml similarity index 68% rename from site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.html rename to site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.yaml index 8fcc673b..8ab68366 100644 --- a/site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.html +++ b/site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.yaml @@ -1,9 +1,6 @@ ---- title: 'Cillum dolore eu fugiat nulla pariatur' summary: '

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

' template: blog-post fieldset: blog-post -date: 'December 25 2018 23:13:53' - ---- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\ No newline at end of file +content: | +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

diff --git a/site/entries/blog/entry.html b/site/entries/blog/entry.html deleted file mode 100644 index 2b69ce40..00000000 --- a/site/entries/blog/entry.html +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Blog -template: blog -fieldset: blog -date: 'December 25 2018 22:27:15' ---- diff --git a/site/entries/blog/entry.yaml b/site/entries/blog/entry.yaml new file mode 100644 index 00000000..801b9286 --- /dev/null +++ b/site/entries/blog/entry.yaml @@ -0,0 +1,3 @@ +title: Blog +template: blog +fieldset: blog diff --git a/site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.html b/site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.yaml similarity index 68% rename from site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.html rename to site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.yaml index 31d158b2..70e15e2e 100644 --- a/site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.html +++ b/site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.yaml @@ -1,9 +1,6 @@ ---- title: 'Excepteur sint occaecat cupidatat non proident' summary: '

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

' template: blog-post fieldset: blog-post -date: 'December 25 2018 22:57:55' - ---- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\ No newline at end of file +content: | +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

diff --git a/site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.html b/site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.yaml similarity index 68% rename from site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.html rename to site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.yaml index 1fa3cc84..299aba1c 100644 --- a/site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.html +++ b/site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.yaml @@ -1,9 +1,6 @@ ---- title: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit' summary: '

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

' template: blog-post fieldset: blog-post -date: 'December 25 2018 22:50:01' - ---- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\ No newline at end of file +content: | +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

diff --git a/site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.html b/site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.yaml similarity index 52% rename from site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.html rename to site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.yaml index d41a8f16..ce38df22 100644 --- a/site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.html +++ b/site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.yaml @@ -1,9 +1,6 @@ ---- title: 'Ullamco laboris nisi ut aliquip' summary: '

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

' template: blog-post fieldset: blog-post -date: 'December 25 2018 23:14:49' - ---- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\ No newline at end of file +content: | +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

diff --git a/site/entries/home/entry.html b/site/entries/home/entry.html deleted file mode 100644 index 641a54a3..00000000 --- a/site/entries/home/entry.html +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Home -template: home -visibility: visible -date: 'December 25 2018 23:46:58' -fieldset: default ---- -

- Welcome! -

-

- Welcome to your new Flextype powered website. -
- Flextype is succesfully installed, you can start editing the content and customising your site in Admin panel. -

-
-

Latest blog posts:

diff --git a/site/entries/home/entry.yaml b/site/entries/home/entry.yaml new file mode 100644 index 00000000..e0399e9a --- /dev/null +++ b/site/entries/home/entry.yaml @@ -0,0 +1,15 @@ +title: Home +template: home +visibility: visible +fieldset: default +content: | +

+ Welcome! +

+

+ Welcome to your new Flextype powered website. +
+ Flextype is succesfully installed, you can start editing the content and customising your site in Admin panel. +

+
+

Latest blog posts:

From 172c210c409410a93e3a7dc9d7a8d38f3a3d7c52 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 20:35:48 +0300 Subject: [PATCH 0357/1219] Flextype Core: Entries - using new improved entries format. --- flextype/Entries.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index d8670a42..ca5fd8fe 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -27,7 +27,7 @@ class Entries */ public static function fetch(string $entry) { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; + $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; if (Filesystem::has($entry_file)) { @@ -76,7 +76,7 @@ class Entries /** * Fetch entries * - * @param string $etnry Entry + * @param string $entry Entry * @param string $order_by Order by specific entry field. * @param string $order_type Order type: DESC or ASC * @param int $offset Offset @@ -99,11 +99,11 @@ class Entries // Create entries cached id foreach ($entries_list as $current_entry) { - if (strpos($current_entry['path'], $entry . '/entry.html') !== false) { + if (strpos($current_entry['path'], $entry . '/entry.yaml') !== false) { // ignore ... } else { - if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.html')) { - $cache_id .= md5('entries' . $current_entry['path'] . Filesystem::getTimestamp($current_entry['path'] . '/entry.html')); + if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.yaml')) { + $cache_id .= md5('entries' . $current_entry['path'] . Filesystem::getTimestamp($current_entry['path'] . '/entry.yaml')); } } } @@ -114,10 +114,10 @@ class Entries // Create entries array from entries list and ignore current requested entry foreach ($entries_list as $current_entry) { - if (strpos($current_entry['path'], $entry . '/entry.html') !== false) { + if (strpos($current_entry['path'], $entry . '/entry.yaml') !== false) { // ignore ... } else { - if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.html')) { + if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.yaml')) { $entries[$current_entry['dirname']] = Entries::fetch($entry . '/' . $current_entry['dirname']); } } @@ -160,7 +160,7 @@ class Entries */ public static function update(string $entry, array $data) : bool { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.html'; + $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; if (Filesystem::has($entry_file)) { return Filesystem::write($entry_file, YamlParser::encode($data)); @@ -186,7 +186,7 @@ class Entries // Try to create directory for new entry if (Filesystem::createDir($entry_dir)) { - $entry_file = $entry_dir . '/entry.html'; + $entry_file = $entry_dir . '/entry.yaml'; // Check if new entry file exists if (!Filesystem::has($entry_file)) { @@ -234,6 +234,6 @@ class Entries */ public static function has(string $entry) : bool { - return Filesystem::has(PATH['entries'] . '/' . $entry . '/entry.html'); + return Filesystem::has(PATH['entries'] . '/' . $entry . '/entry.yaml'); } } From badedb71cfb0816e3def0bc37cc3364e22f547d2 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 14 Feb 2019 21:09:47 +0300 Subject: [PATCH 0358/1219] Admin Panel: Entries Manager - using new Entries API. --- site/plugins/admin/classes/EntriesManager.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index faf445bd..4a50037b 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -147,16 +147,15 @@ class EntriesManager if (isset($action) && $action == 'save-form') { if (Token::check((Http::post('token')))) { - $data = $_POST; + $_data = $_POST; - Arr::delete($data, 'token'); - Arr::delete($data, 'action'); - Arr::delete($data, 'content'); + $data = []; - if (Http::post('content') !== null) { - Arr::set($data, 'content', $indenter->indent(Http::post('content'))); - } else { - Arr::set($data, 'content', ''); + Arr::delete($_data, 'token'); + Arr::delete($_data, 'action'); + + foreach ($_data as $key => $_d) { + $data[$key] = $indenter->indent($_d); } if (Entries::update(Http::get('entry'), $data)) { From f99a769ee5082e2227cdd754d267a8da7e4b6ad8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 15 Feb 2019 22:05:00 +0300 Subject: [PATCH 0359/1219] Flextype Core: Default Theme - templates fixes --- site/themes/default/views/templates/blog.php | 2 +- site/themes/default/views/templates/home.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/themes/default/views/templates/blog.php b/site/themes/default/views/templates/blog.php index ebda3581..5a21faeb 100644 --- a/site/themes/default/views/templates/blog.php +++ b/site/themes/default/views/templates/blog.php @@ -1,7 +1,7 @@ display() ?>

- +

diff --git a/site/themes/default/views/templates/home.php b/site/themes/default/views/templates/home.php index e187a7c7..ddb76829 100644 --- a/site/themes/default/views/templates/home.php +++ b/site/themes/default/views/templates/home.php @@ -1,8 +1,8 @@ display() ?> - -
+ +

From 8c357917e4478c20d20f6def02ac8e2eb9224511 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 16 Feb 2019 00:40:20 +0300 Subject: [PATCH 0360/1219] Flextype Core: Default Theme - default fieldset - improvements --- site/themes/default/fieldsets/default.yaml | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/site/themes/default/fieldsets/default.yaml b/site/themes/default/fieldsets/default.yaml index 59ff43c7..9591c62a 100644 --- a/site/themes/default/fieldsets/default.yaml +++ b/site/themes/default/fieldsets/default.yaml @@ -23,3 +23,34 @@ sections: title: admin_date type: text size: col-4 + seo: + title: 'Seo' + fields: + description: + title: admin_description + type: textarea + size: col-12 + menu: + title: 'Menu' + fields: + menu_item_title: + title: admin_menu_item_title + type: text + size: col-4 + menu_item_url: + title: admin_menu_item_url + type: text + size: col-4 + menu_item_target: + title: admin_menu_item_target + type: select + options: + blank: '_blank' + self: '_self' + parent: '_parent' + top: '_top' + size: col-4 + menu_item_order: + title: admin_menu_item_order + type: text + size: col-4 From 64c6220bdd9d71d091d1f797d75b80fbcd90fb88 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 16 Feb 2019 00:53:29 +0300 Subject: [PATCH 0361/1219] Admin Panel: Entries Manager - Fieldsets Sections - implementation --- site/plugins/admin/classes/EntriesManager.php | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 4a50037b..9c92dbdf 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -212,12 +212,29 @@ class EntriesManager public static function displayEntryForm(array $fieldsets, array $values = [], string $content) { - echo Form::open(null, ['id' => 'form', 'class' => 'row']); + echo Form::open(null, ['id' => 'form']); echo Form::hidden('token', Token::generate()); echo Form::hidden('action', 'save-form'); if (count($fieldsets['sections']) > 0) { - foreach ($fieldsets['sections'] as $section) { + + echo ('
'); + + echo ('
'); + + foreach ($fieldsets['sections'] as $key => $section) { + + echo ('
'); + echo ('
'); + foreach ($section['fields'] as $element => $property) { // Create attributes @@ -311,7 +328,12 @@ class EntriesManager echo '
'; } } + + echo ('
'); + echo ('
'); } + + echo (''); } echo Form::close(); From e4fd14fcc3a84a4ff88c25810547fe80af343bc4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 16 Feb 2019 01:04:53 +0300 Subject: [PATCH 0362/1219] Admin Panel: Entries Manager - Fieldsets Sections - implementation --- .../admin/assets/scss/components/nav.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/site/plugins/admin/assets/scss/components/nav.scss b/site/plugins/admin/assets/scss/components/nav.scss index 933b7327..f9b49762 100644 --- a/site/plugins/admin/assets/scss/components/nav.scss +++ b/site/plugins/admin/assets/scss/components/nav.scss @@ -181,3 +181,19 @@ margin-right: 10px; } } + +.nav-pills { + margin-bottom: 20px; +} + +.nav-pills .nav-link { + border-radius: 0; + color: black; +} + +.nav-pills .nav-link.active, +.nav-pills .show > .nav-link { + background: none; + border-bottom: 1px solid #ccc; + color: black; +} From a239b03e5223cc521332ef29feab182af8d69566 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 16 Feb 2019 18:24:28 +0300 Subject: [PATCH 0363/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 63afdb5a..13fe8068 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -141,7 +141,7 @@ admin_message_fieldset_duplicated: "Fieldset dupliziert" admin_message_entry_duplicated: "Eintrag dupliziert" admin_message_cache_files_deleted: "Cache Dateien gelöscht" admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" -admin_message_entry_changes_not_saved: "Changes not saved" +admin_message_entry_changes_not_saved: "Änderungen nicht gespeichert" admin_message_entry_cloned: "Eintrag dupliziert" admin_message_entry_created: "Eintrag erstellt" admin_message_entry_deleted: "Eintrag gelöscht" From fbab1ad39aeee216ba7c81c7c4abcc4ae0682be0 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 16 Feb 2019 23:10:19 +0300 Subject: [PATCH 0364/1219] Admin Panel: translates updates --- site/plugins/admin/languages/en_US.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index c4c2807d..ab76c4ca 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -178,3 +178,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 26e293e9eb6168129e256806bf1381f735046b5d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sat, 16 Feb 2019 23:31:11 +0300 Subject: [PATCH 0365/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index dc42a8ff..717c57bf 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -141,7 +141,7 @@ admin_message_fieldset_duplicated: "Набор полей удален" admin_message_entry_duplicated: "Запись дублировалась" admin_message_cache_files_deleted: "Файлы кеша удалены" admin_message_entry_changes_saved: "Изменения успешно сохранены" -admin_message_entry_changes_not_saved: "Changes not saved" +admin_message_entry_changes_not_saved: "Изменения не сохранены" admin_message_entry_cloned: "Запись клонировалась" admin_message_entry_created: "Запись создана" admin_message_entry_deleted: "Запись удалена" From 4c20f7c1cefd33d7a7796d478922825df1586751 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 13:24:28 +0300 Subject: [PATCH 0366/1219] Admin Panel: translates updates --- site/plugins/admin/languages/en_US.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index ab76c4ca..e211f669 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -138,12 +138,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" From df8c22f0630534289e0432b3b7a42a0e997c8fd8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 13:25:04 +0300 Subject: [PATCH 0367/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 9c92dbdf..9a397d0b 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -36,28 +36,10 @@ class EntriesManager EntriesManager::addEntry(); break; case 'delete': - if (Http::get('entry') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::deleteDir(PATH['entries'] . '/' . Http::get('entry')); - Notification::set('success', __('admin_message_entry_deleted')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::get('entry_current')); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + EntriesManager::deleteEntry(); break; case 'duplicate': - if (Http::get('entry') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::copy(PATH['entries'] . '/' . Http::get('entry'), - PATH['entries'] . '/' . Http::get('entry') . '-duplicate-' . date("Ymd_His"), - true); - Notification::set('success', __('admin_message_entry_duplicated')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + EntriesManager::duplicateEntry(); break; case 'rename': EntriesManager::renameEntry(); @@ -404,6 +386,42 @@ class EntriesManager } } + protected static function duplicateEntry() + { + if (Http::get('entry') != '') { + if (Token::check((Http::get('token')))) { + + if (Entries:copy( Http::get('entry'), Http::get('entry') . '-duplicate-' . date("Ymd_His"), true)) { + Notification::set('success', __('admin_message_entry_duplicated')); + } else { + Notification::set('error', __('admin_message_entry_was_not_duplicated')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + + protected static function deleteEntry() + { + if (Http::get('entry') != '') { + if (Token::check((Http::get('token')))) { + + if (Entries::delete(Http::get('entry'))) { + Notification::set('success', __('admin_message_entry_deleted')); + } else { + Notification::set('error', __('admin_message_entry_was_not_deleted')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::get('entry_current')); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + protected static function renameEntry() { $entry = Entries::fetch(Http::get('entry')); From bb9b3462648f70a89eb8d0d6570690f9e62e3d47 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:36 +0300 Subject: [PATCH 0368/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 3c98d3d9ef5ad703337479b93333ad7db9fd4131 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:38 +0300 Subject: [PATCH 0369/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From e3286aeb4ccdfb26bd4ec1cb67d2525eedf6d121 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:39 +0300 Subject: [PATCH 0370/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index d94490cd..5551e3d0 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 2b395734c4d3460550860d0a8794fa98140fbae9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:41 +0300 Subject: [PATCH 0371/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 7b55a57d..1e7e32b5 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 3c4caa5ff24b67b106e8b70f8a75563c7e581e74 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:43 +0300 Subject: [PATCH 0372/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 9547e1bdbc7734210dd51895f412abb5b7351ffe Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:44 +0300 Subject: [PATCH 0373/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 1529535a547896ef124fbaf34045519d4f31154a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:46 +0300 Subject: [PATCH 0374/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From fffabf4ed88bed52b020d8a7a3ae1bebfc9ca886 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:48 +0300 Subject: [PATCH 0375/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 717c57bf..763f81a1 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Набор полей удален" admin_message_fieldset_renamed: "Набор полей создан" admin_message_fieldset_duplicated: "Набор полей удален" admin_message_entry_duplicated: "Запись дублировалась" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Файлы кеша удалены" admin_message_entry_changes_saved: "Изменения успешно сохранены" admin_message_entry_changes_not_saved: "Изменения не сохранены" admin_message_entry_cloned: "Запись клонировалась" admin_message_entry_created: "Запись создана" admin_message_entry_deleted: "Запись удалена" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Файл успешно удален" admin_message_entry_file_uploaded: "Файл успешно загружен" admin_message_entry_file_not_uploaded: "Файл не был загружен" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Заголовок должен иметь бу admin_entries_visible: "Видимый" admin_entries_draft: "Черновик" admin_entries_hidden: "Скрытый" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 390e95faa3b9e1f725b2a67bf952277f75d0f57f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:49 +0300 Subject: [PATCH 0376/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 83d5fa13569280e0db7f1dcf0c4f3e478442d7af Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:51 +0300 Subject: [PATCH 0377/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 41aa20f2..ef195a76 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 0aa1cd7919c9f0c19d5cb7e0967264e6dd8e3dc7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:52 +0300 Subject: [PATCH 0378/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From ff2d51c3f6972f76db657f54de694cc373741153 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:54 +0300 Subject: [PATCH 0379/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 04969a7e..79b32922 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Zestaw pól został usunięty" admin_message_fieldset_renamed: "Zmieniono nazwę zestaw pól" admin_message_fieldset_duplicated: "Zestaw pól został skopiowany" admin_message_entry_duplicated: "Wpis został skopiowany" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Pliki pamięci podręcznej zostały usunięte" admin_message_entry_changes_saved: "Zmiany zostały pomyślnie zapisane" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Wpis został skopiowany" admin_message_entry_created: "Utworzono wpis" admin_message_entry_deleted: "Wpis został usunięty" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Plik został pomyślnie usunięty" admin_message_entry_file_uploaded: "Plik został pomyślnie przesłany" admin_message_entry_file_not_uploaded: "Plik nie został przesłany" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Tytuł musi być wartością alfanumeryczną" admin_entries_visible: "Widoczny" admin_entries_draft: "Szkic" admin_entries_hidden: "Ukryty" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 7f54f842ffd5014caa647e5a9f53d56b3501f1fc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:55 +0300 Subject: [PATCH 0380/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 2e22291e4549996b4a2b0f75545b829e8c58fe55 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:57 +0300 Subject: [PATCH 0381/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 09d455dcf312d055dc2300736892f8f94e926ff7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:33:59 +0300 Subject: [PATCH 0382/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 8addd7b3..627d9980 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 69c725c3b94888ed41c4f7ffdcc0f1c6b61a6a3a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:00 +0300 Subject: [PATCH 0383/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 8f4c8c2e..60803589 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 6fdb85fc9bc76b1f1c4c9908951fa2fe8ba94bce Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:02 +0300 Subject: [PATCH 0384/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 0d342f5ddcc23136d5b2be7e2d5dd13066e9ad2a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:03 +0300 Subject: [PATCH 0385/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From b76b721b2be930de33ee6fbccba547dba37436c0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:05 +0300 Subject: [PATCH 0386/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 22889f79a0baeb5d2952453e2b24e76c13ba9e07 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:06 +0300 Subject: [PATCH 0387/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 13fe8068..89650f4c 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset gelöscht" admin_message_fieldset_renamed: "Fieldset umbenannt" admin_message_fieldset_duplicated: "Fieldset dupliziert" admin_message_entry_duplicated: "Eintrag dupliziert" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache Dateien gelöscht" admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" admin_message_entry_changes_not_saved: "Änderungen nicht gespeichert" admin_message_entry_cloned: "Eintrag dupliziert" admin_message_entry_created: "Eintrag erstellt" admin_message_entry_deleted: "Eintrag gelöscht" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" admin_message_entry_file_not_uploaded: "Datei konnte nicht hochgeladen werden" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Titel muss ein alphanumerischer Wert sein (minde admin_entries_visible: "Sichtbar" admin_entries_draft: "Entwurf" admin_entries_hidden: "Versteckt" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From a49177cfc12e17164d5d0294c8d1549d6909b061 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:08 +0300 Subject: [PATCH 0388/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index bbffc19e..7389745e 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 62e6fc68742d9ffc0168a40e73eadab58d4a45a0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:09 +0300 Subject: [PATCH 0389/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From f0263497cf86fa0ae1f90c6594f128f5faac93b1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:11 +0300 Subject: [PATCH 0390/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 9cd41679..8932b8d9 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 5ef75e32f0c2640efcbf3a3035e791a90fed94c8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:13 +0300 Subject: [PATCH 0391/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From c2d0d59ca90328188d8de8caa1c65646926cfc10 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:14 +0300 Subject: [PATCH 0392/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 7fa68746..5fa61b38 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Datové pole odstraněno" admin_message_fieldset_renamed: "Datové pole přejmenováno" admin_message_fieldset_duplicated: "Datové pole duplikováno" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Soubory cache byly odstraněny" admin_message_entry_changes_saved: "Změny byly uloženy" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Stránka byla duplikována" admin_message_entry_created: "Stránka byla vytvořena" admin_message_entry_deleted: "Stránka byla odstraněna" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Soubor byl odstraněn" admin_message_entry_file_uploaded: "Soubor byl v pořádku nahrán" admin_message_entry_file_not_uploaded: "Soubor nebyl nahrán" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From d522484929c976a1dde6958fedda462dbe118207 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:16 +0300 Subject: [PATCH 0393/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 60b30f60..217384f5 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Unos je dupliciran" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache fajlovi su obrisani" admin_message_entry_changes_saved: "Promjene su uspješno sačuvane" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Unos je kloniran" admin_message_entry_created: "Unos je stvoren" admin_message_entry_deleted: "Unos je obrisan" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Fajl je uspješno obrisan" admin_message_entry_file_uploaded: "Fajl je uspješno uploadan" admin_message_entry_file_not_uploaded: "Fajl nije uploadan" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Naslov mora biti alfanumerička vrijednost" admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 3745b66a47833080897be405cf914230ecd21fd4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:17 +0300 Subject: [PATCH 0394/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 982db5733c875a555ee818a5053f683a1da10bc2 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:19 +0300 Subject: [PATCH 0395/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 0ed00a54282afd3ec34f05312208304c5e338206 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:21 +0300 Subject: [PATCH 0396/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 518cbeccef04adcadb56532b7dfd7e232169a33a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 13:34:23 +0300 Subject: [PATCH 0397/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index f10091fc..10a0927b 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -139,12 +139,14 @@ admin_message_fieldset_deleted: "Fieldset deleted" admin_message_fieldset_renamed: "Fieldset renamed" admin_message_fieldset_duplicated: "Fieldset duplicated" admin_message_entry_duplicated: "Entry duplicated" +admin_message_entry_was_not_duplicated: "Entry was not duplicated" admin_message_cache_files_deleted: "Cache files deleted" admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" @@ -179,3 +181,7 @@ admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 ch admin_entries_visible: "Visible" admin_entries_draft: "Draft" admin_entries_hidden: "Hidden" +admin_menu_item_title: "Title" +admin_menu_item_url: "Url" +admin_menu_item_target: "Target" +admin_menu_item_order: "Order" From 90ab14594da6b6a88a6c01f483bb50473a61d2e3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 13:41:47 +0300 Subject: [PATCH 0398/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 9a397d0b..c89b8d95 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -391,7 +391,7 @@ class EntriesManager if (Http::get('entry') != '') { if (Token::check((Http::get('token')))) { - if (Entries:copy( Http::get('entry'), Http::get('entry') . '-duplicate-' . date("Ymd_His"), true)) { + if (Entries::copy(Http::get('entry'), Http::get('entry') . '-duplicate-' . date("Ymd_His"), true)) { Notification::set('success', __('admin_message_entry_duplicated')); } else { Notification::set('error', __('admin_message_entry_was_not_duplicated')); From 34d213655386d0b758c0755813c47d774778af2a Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 13:52:45 +0300 Subject: [PATCH 0399/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index c89b8d95..63142a2b 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -25,11 +25,7 @@ class EntriesManager { Registry::set('sidebar_menu_item', 'entries'); - if (Http::get('entry') && Http::get('entry') != '') { - $query = Http::get('entry'); - } else { - $query = ''; - } + $query = EntriesManager::getEntriesQuery(); switch (Http::getUriSegment(2)) { case 'add': @@ -166,11 +162,9 @@ class EntriesManager } break; default: - if (!Http::get('add')) { - Themes::view('admin/views/templates/content/entries/list') - ->assign('entries_list', Entries::fetchAll($query, 'date', 'DESC')) - ->display(); - } + Themes::view('admin/views/templates/content/entries/list') + ->assign('entries_list', Entries::fetchAll($query, 'date', 'DESC')) + ->display(); break; } } @@ -321,6 +315,17 @@ class EntriesManager echo Form::close(); } + protected static function getEntriesQuery() + { + if (Http::get('entry') && Http::get('entry') != '') { + $query = Http::get('entry'); + } else { + $query = ''; + } + + return $query; + } + protected static function processFilesManager() { $files_directory = PATH['entries'] . '/' . Http::get('entry') . '/'; @@ -726,10 +731,8 @@ class EntriesManager if (move_uploaded_file($file['tmp_name'], $filename)) { - if ($chmod !== false) { - // Set permissions on filename - chmod($filename, $chmod); - } + // Set permissions on filename + chmod($filename, $chmod); // Return new file path return $filename; From f5bc3f4b17f63205f2edbeec92360b78e81bbc62 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 18:19:07 +0300 Subject: [PATCH 0400/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 249 ++++++++++-------- 1 file changed, 132 insertions(+), 117 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 63142a2b..ef41fce2 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -44,127 +44,13 @@ class EntriesManager EntriesManager::typeEntry(); break; case 'move': - $entry = Entries::processEntry(Http::get('entry')); - - $move_entry = Http::post('move_entry'); - - if (isset($move_entry)) { - if (Token::check((Http::post('token')))) { - if (!Filesystem::has(realpath(PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Http::post('name_current')))) { - if (rename( - PATH['entries'] . '/' . Http::post('entry_path_current'), - PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) - )) { - Notification::set('success', __('admin_message_entry_moved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - $_entries_list = Entries::fetchAll('', 'slug'); - $entries_list['/'] = '/'; - foreach ($_entries_list as $_entry) { - if ($_entry['slug'] != '') { - $entries_list[$_entry['slug']] = $_entry['slug']; - } else { - $entries_list[Registry::get('settings.entries.main')] = Registry::get('settings.entries.main'); - } - } - - Themes::view('admin/views/templates/content/entries/move') - ->assign('entry_path_current', Http::get('entry')) - ->assign('entries_list', $entries_list) - ->assign('name_current', Arr::last(explode("/", Http::get('entry')))) - ->assign('entry_parent', implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))) - ->assign('entry', $entry) - ->display(); + EntriesManager::moveEntry(); break; case 'edit': - $entry = Entries::fetch(Http::get('entry')); - - if (Http::get('media') && Http::get('media') == 'true') { - EntriesManager::processFilesManager(); - - Themes::view('admin/views/templates/content/entries/media') - ->assign('entry_name', Http::get('entry')) - ->assign('files', EntriesManager::getMediaList(Http::get('entry')), true) - ->assign('entry', $entry) - ->display(); - } else { - if (Http::get('source') && Http::get('source') == 'true') { - $action = Http::post('action'); - - if (isset($action) && $action == 'save-form') { - if (Token::check((Http::post('token')))) { - Filesystem::write( - PATH['entries'] . '/' . Http::post('entry_name') . '/entry.html', - Http::post('entry_content') - ); - Notification::set('success', __('admin_message_entry_changes_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::post('entry_name') . '&source=true'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - $entry_content = Filesystem::read(PATH['entries'] . '/' . Http::get('entry') . '/entry.html'); - - Themes::view('admin/views/templates/content/entries/source') - ->assign('entry_name', Http::get('entry')) - ->assign('entry_content', $entry_content) - ->assign('entry', $entry) - ->assign('files', EntriesManager::getMediaList(Http::get('entry')), true) - ->display(); - } else { - $action = Http::post('action'); - $indenter = new Indenter(); - - if (isset($action) && $action == 'save-form') { - if (Token::check((Http::post('token')))) { - - $_data = $_POST; - - $data = []; - - Arr::delete($_data, 'token'); - Arr::delete($_data, 'action'); - - foreach ($_data as $key => $_d) { - $data[$key] = $indenter->indent($_d); - } - - if (Entries::update(Http::get('entry'), $data)) { - Notification::set('success', __('admin_message_entry_changes_saved')); - } else { - Notification::set('error', __('admin_message_entry_changes_not_saved')); - } - - Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry')); - } - } - - // Fieldset for current entry template - $fieldset_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . (isset($entry['fieldset']) ? $entry['fieldset'] : 'default') . '.yaml'; - $fieldset = YamlParser::decode(Filesystem::read($fieldset_path)); - is_null($fieldset) and $fieldset = []; - - Themes::view('admin/views/templates/content/entries/content') - ->assign('entry_name', Http::get('entry')) - ->assign('entry', $entry) - ->assign('fieldset', $fieldset) - ->assign('templates', Themes::getTemplates()) - ->assign('files', EntriesManager::getMediaList(Http::get('entry')), true) - ->display(); - } - } + EntriesManager::editEntry(); break; default: - Themes::view('admin/views/templates/content/entries/list') - ->assign('entries_list', Entries::fetchAll($query, 'date', 'DESC')) - ->display(); + EntriesManager::listEntry(); break; } } @@ -326,6 +212,13 @@ class EntriesManager return $query; } + protected static function listEntry() + { + Themes::view('admin/views/templates/content/entries/list') + ->assign('entries_list', Entries::fetchAll(EntriesManager::getEntriesQuery(), 'date', 'DESC')) + ->display(); + } + protected static function processFilesManager() { $files_directory = PATH['entries'] . '/' . Http::get('entry') . '/'; @@ -391,6 +284,87 @@ class EntriesManager } } + protected static function editEntry() + { + $entry = Entries::fetch(Http::get('entry')); + + if (Http::get('media') && Http::get('media') == 'true') { + EntriesManager::processFilesManager(); + + Themes::view('admin/views/templates/content/entries/media') + ->assign('entry_name', Http::get('entry')) + ->assign('files', EntriesManager::getMediaList(Http::get('entry')), true) + ->assign('entry', $entry) + ->display(); + } else { + if (Http::get('source') && Http::get('source') == 'true') { + $action = Http::post('action'); + + if (isset($action) && $action == 'save-form') { + if (Token::check((Http::post('token')))) { + Filesystem::write( + PATH['entries'] . '/' . Http::post('entry_name') . '/entry.html', + Http::post('entry_content') + ); + Notification::set('success', __('admin_message_entry_changes_saved')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::post('entry_name') . '&source=true'); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + $entry_content = Filesystem::read(PATH['entries'] . '/' . Http::get('entry') . '/entry.html'); + + Themes::view('admin/views/templates/content/entries/source') + ->assign('entry_name', Http::get('entry')) + ->assign('entry_content', $entry_content) + ->assign('entry', $entry) + ->assign('files', EntriesManager::getMediaList(Http::get('entry')), true) + ->display(); + } else { + $action = Http::post('action'); + $indenter = new Indenter(); + + if (isset($action) && $action == 'save-form') { + if (Token::check((Http::post('token')))) { + + $_data = $_POST; + + $data = []; + + Arr::delete($_data, 'token'); + Arr::delete($_data, 'action'); + + foreach ($_data as $key => $_d) { + $data[$key] = $indenter->indent($_d); + } + + if (Entries::update(Http::get('entry'), $data)) { + Notification::set('success', __('admin_message_entry_changes_saved')); + } else { + Notification::set('error', __('admin_message_entry_changes_not_saved')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry')); + } + } + + // Fieldset for current entry template + $fieldset_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . (isset($entry['fieldset']) ? $entry['fieldset'] : 'default') . '.yaml'; + $fieldset = YamlParser::decode(Filesystem::read($fieldset_path)); + is_null($fieldset) and $fieldset = []; + + Themes::view('admin/views/templates/content/entries/content') + ->assign('entry_name', Http::get('entry')) + ->assign('entry', $entry) + ->assign('fieldset', $fieldset) + ->assign('templates', Themes::getTemplates()) + ->assign('files', EntriesManager::getMediaList(Http::get('entry')), true) + ->display(); + } + } + } + protected static function duplicateEntry() { if (Http::get('entry') != '') { @@ -409,6 +383,47 @@ class EntriesManager } } + protected static function moveEntry() + { + $entry = Entries::fetch(Http::get('entry')); + + $move_entry = Http::post('move_entry'); + + if (isset($move_entry)) { + if (Token::check((Http::post('token')))) { + if (!Filesystem::has(realpath(PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Http::post('name_current')))) { + if (rename( + PATH['entries'] . '/' . Http::post('entry_path_current'), + PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) + )) { + Notification::set('success', __('admin_message_entry_moved')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + $_entries_list = Entries::fetchAll('', 'slug'); + $entries_list['/'] = '/'; + foreach ($_entries_list as $_entry) { + if ($_entry['slug'] != '') { + $entries_list[$_entry['slug']] = $_entry['slug']; + } else { + $entries_list[Registry::get('settings.entries.main')] = Registry::get('settings.entries.main'); + } + } + + Themes::view('admin/views/templates/content/entries/move') + ->assign('entry_path_current', Http::get('entry')) + ->assign('entries_list', $entries_list) + ->assign('name_current', Arr::last(explode("/", Http::get('entry')))) + ->assign('entry_parent', implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))) + ->assign('entry', $entry) + ->display(); + } + protected static function deleteEntry() { if (Http::get('entry') != '') { From 07aca0fd6bd5262f0fc43e9a2e6d4c320ceeae7b Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 19:49:47 +0300 Subject: [PATCH 0401/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index ef41fce2..6293b43a 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -391,14 +391,18 @@ class EntriesManager if (isset($move_entry)) { if (Token::check((Http::post('token')))) { - if (!Filesystem::has(realpath(PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Http::post('name_current')))) { - if (rename( - PATH['entries'] . '/' . Http::post('entry_path_current'), - PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) + if (!Entries::has(Http::post('parent_entry') . '/' . Http::post('name_current'))) { + if (Entries::rename( + Http::post('entry_path_current'), + Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) )) { Notification::set('success', __('admin_message_entry_moved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } else { + Notification::set('error', __('admin_message_entry_was_not_moved')); } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } } else { throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); From 21c3c67608a29fab451d318c9b1445d7c290ce18 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 19:50:00 +0300 Subject: [PATCH 0402/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/languages/en_US.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index e211f669..76b80699 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -150,6 +150,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 709c4b6f86218f76c5ec881883cc6310de377017 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:31 +0300 Subject: [PATCH 0403/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 37fc26f91a1c460093a60cc82da02a0b502fbca5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:33 +0300 Subject: [PATCH 0404/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 634ab40e31b0db1899d85a6ed5b6158ee82b4121 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:34 +0300 Subject: [PATCH 0405/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 5551e3d0..4c7f9b5a 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 81304dbc9e4928b9ee09cf58521cf320a2f217b4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:35 +0300 Subject: [PATCH 0406/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 1e7e32b5..8e47487e 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 2c44d5b95cd4e8a584e2af104badb99dcbe71392 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:37 +0300 Subject: [PATCH 0407/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 47a77f9a99814cdf67c08fba72a276f5a87a845f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:38 +0300 Subject: [PATCH 0408/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 78f011af7094f96b57afb3e8d88f79d43391d451 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:40 +0300 Subject: [PATCH 0409/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 3f9c2850bed5cfd6749f3b1a842530893df97ef3 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:41 +0300 Subject: [PATCH 0410/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 763f81a1..33125fd2 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "Файл успешно удален" admin_message_entry_file_uploaded: "Файл успешно загружен" admin_message_entry_file_not_uploaded: "Файл не был загружен" admin_message_entry_moved: "Запись перемещена" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Запись переименована" admin_message_settings_saved: "Настройки сохранены" admin_message_wrong_username_password: "Неверное имя пользователя или пароль" From d18f739957100658a18d54f8d4579dd3582b16c9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:43 +0300 Subject: [PATCH 0411/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From c7dcaf1424362a81faeda670d6220f86afb6ee4f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:44 +0300 Subject: [PATCH 0412/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index ef195a76..adfe753a 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 6a66c62738ad6a1b17547e3983a8c285367c9b64 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:46 +0300 Subject: [PATCH 0413/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 06820521d5d1da03cc566c398a328f5aa5cdc0cf Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:48 +0300 Subject: [PATCH 0414/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 79b32922..404e85db 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "Plik został pomyślnie usunięty" admin_message_entry_file_uploaded: "Plik został pomyślnie przesłany" admin_message_entry_file_not_uploaded: "Plik nie został przesłany" admin_message_entry_moved: "Wpis został przeniesiony" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Zmieniono nazwę wpisu" admin_message_settings_saved: "Ustawienia zapisane" admin_message_wrong_username_password: "Zła nazwa użytkownika lub hasło" From 32fb06979f394b654489cdc233a667039935fd3c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:49 +0300 Subject: [PATCH 0415/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From f61909be4e8886a86b56e0ae26dab26770180754 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:51 +0300 Subject: [PATCH 0416/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From b2fd77c1483addb5059bedb6fe70b9ccda70d929 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:53 +0300 Subject: [PATCH 0417/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 627d9980..67476ac0 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From cf3fa673b75e9b1d97798e10fed960bf53084e2d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:54 +0300 Subject: [PATCH 0418/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 60803589..78c609bb 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 829c8c140056f9db7a4e28a3da6bcc099ee3bdc6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:56 +0300 Subject: [PATCH 0419/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From d5d89988ba47f433a8ff3c3771ee684044d1aa33 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:58 +0300 Subject: [PATCH 0420/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 26e444dbed47856cbc069813890ae27e8b64eb4b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:53:59 +0300 Subject: [PATCH 0421/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 683542711c931d773088ffcffe206d2598e48ff5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:01 +0300 Subject: [PATCH 0422/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 89650f4c..e0ef2d3d 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" admin_message_entry_file_not_uploaded: "Datei konnte nicht hochgeladen werden" admin_message_entry_moved: "Eintrag verschoben" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Eintrag umbenannt" admin_message_settings_saved: "Einstellungen gespeichert" admin_message_wrong_username_password: "Benutzername oder Passwort falsch" From 92a0a22bb0efc083e2a52d556b0c97403b4a35e9 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:03 +0300 Subject: [PATCH 0423/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index 7389745e..30a202e7 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From d46b75d6e165767a391319b6391a491da3177bfe Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:04 +0300 Subject: [PATCH 0424/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 52c093c57b0ec0a5044fb45237938c15471bcda1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:06 +0300 Subject: [PATCH 0425/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 8932b8d9..a03dca19 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From b89dce57dd003dabd2da12588062269eeb94d88d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:08 +0300 Subject: [PATCH 0426/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 4487d8596ec43c8a5204296fab86661fd99abcd7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:09 +0300 Subject: [PATCH 0427/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 5fa61b38..77cef3f1 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "Soubor byl odstraněn" admin_message_entry_file_uploaded: "Soubor byl v pořádku nahrán" admin_message_entry_file_not_uploaded: "Soubor nebyl nahrán" admin_message_entry_moved: "Stránka byla přesunuta" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Stránka byla přejmenována" admin_message_settings_saved: "Nastavení uloženo" admin_message_wrong_username_password: "Špatné uživatelské jméno nebo heslo" From 56aa545a771081d564347984f4bee2727f548288 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:11 +0300 Subject: [PATCH 0428/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 217384f5..10081f70 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "Fajl je uspješno obrisan" admin_message_entry_file_uploaded: "Fajl je uspješno uploadan" admin_message_entry_file_not_uploaded: "Fajl nije uploadan" admin_message_entry_moved: "Unos je premješten" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Unos je preimenovan" admin_message_settings_saved: "Postavke su sačuvane" admin_message_wrong_username_password: "Pogrešno korisničko ime ili lozinka" From 27176ab8ef761abd4112521d8dea2ed228583055 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:12 +0300 Subject: [PATCH 0429/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 15c5466cc57d16ef4da1b741f6ef08a29a393bea Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:14 +0300 Subject: [PATCH 0430/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 7ed418ce7d6b8eec08efd5df8208f446d4b352a0 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:16 +0300 Subject: [PATCH 0431/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From d8ab93fa3aaaf338d0153947f39f2c22e0f2a2e7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 17 Feb 2019 19:54:17 +0300 Subject: [PATCH 0432/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index 10a0927b..24deb81e 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -151,6 +151,7 @@ admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" admin_message_entry_file_not_uploaded: "File was not uploaded" admin_message_entry_moved: "Entry moved" +admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" admin_message_wrong_username_password: "Wrong username or password" From 69134bade4a7cef126273bfc0b68bb5b8ef37852 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 20:29:18 +0300 Subject: [PATCH 0433/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/languages/en_US.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index 76b80699..007c1c10 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -145,6 +145,7 @@ admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 580ced0bfea13f812efd698444b43efec2ec39e3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 20:29:31 +0300 Subject: [PATCH 0434/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 6293b43a..4b209666 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -454,14 +454,17 @@ class EntriesManager if (isset($rename_entry)) { if (Token::check((Http::post('token')))) { - if (!Filesystem::has(PATH['entries'] . '/' . Http::post('name'))) { - if (Filesystem::rename( - PATH['entries'] . '/' . Http::post('entry_path_current'), - PATH['entries'] . '/' . Http::post('entry_parent') . '/' . Text::safeString(Http::post('name'), '-', true) + if (!Entries::has(Http::post('name'))) { + if (Entries::rename( + Http::post('entry_path_current'), + Http::post('entry_parent') . '/' . Text::safeString(Http::post('name'), '-', true) )) { Notification::set('success', __('admin_message_entry_renamed')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('entry_parent')); + } else { + Notification::set('error', __('admin_message_entry_was_not_renamed')); } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('entry_parent')); } } else { throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); @@ -487,9 +490,7 @@ class EntriesManager $content = $entry['content']; Arr::delete($entry, 'content'); - Arr::delete($entry, 'url'); Arr::delete($entry, 'slug'); - Arr::delete($entry, 'base_url'); $frontmatter = $_POST; Arr::delete($frontmatter, 'token'); From fac4f8f1faa7f6b6722e7b2f0aba0778dfc3632e Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:08:12 +0300 Subject: [PATCH 0435/1219] Admin Panel: Entries Manager - start using Fieldsets default_field --- .../views/templates/content/entries/list.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/views/templates/content/entries/list.php b/site/plugins/admin/views/templates/content/entries/list.php index b0e16d38..c3968a63 100644 --- a/site/plugins/admin/views/templates/content/entries/list.php +++ b/site/plugins/admin/views/templates/content/entries/list.php @@ -25,7 +25,7 @@ - + @@ -34,7 +34,22 @@ {% endfor %} From feac619578e35a8f166bb5355a68346a487125d1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 13 May 2019 12:48:50 +0300 Subject: [PATCH 0743/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../admin/app/Controllers/EntriesController.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 599b06a5..d0dc7168 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -162,4 +162,19 @@ class EntriesController extends Controller return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $data['parent_entry']); } } + + public function type($request, $response, $args) + { + + } + + public function move($request, $response, $args) + { + + } + + public function rename($request, $response, $args) + { + + } } From 60cf84c08bde82328dd434cfacaa59cd9f421fae Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 12:32:36 +0300 Subject: [PATCH 0744/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../app/Controllers/EntriesController.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index d0dc7168..1df5cfa0 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -165,7 +165,43 @@ class EntriesController extends Controller public function type($request, $response, $args) { + $entry = $this->entries->fetch($this->getEntriesQuery($request->getQueryParams()['entry'])); + $fieldsets = []; + + // Get fieldsets files + $_fieldsets = Filesystem::listContents(PATH['themes'] . '/' . $this->registry->get('settings.theme') . '/fieldsets/'); + + // If there is any template file then go... + if (count($_fieldsets) > 0) { + foreach ($_fieldsets as $fieldset) { + if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'json') { + $fieldset_content = JsonParser::decode(Filesystem::read($fieldset['path'])); + if (isset($fieldset_content['sections']) && isset($fieldset_content['sections']['main']) && isset($fieldset_content['sections']['main']['fields'])) { + $fieldsets[$fieldset['basename']] = $fieldset_content['title']; + } + } + } + } + + return $this->view->render($response, + 'plugins/admin/views/templates/content/entries/type.html', [ + 'fieldset' => $entry['fieldset'], + 'fieldsets' => $fieldsets, + 'menu_item' => 'entries', + 'links' => [ + 'entries' => [ + 'link' => $this->router->urlFor('admin.entries.index'), + 'title' => __('admin_entries'), + 'attributes' => ['class' => 'navbar-item'] + ], + 'entries_type' => [ + 'link' => $this->router->urlFor('admin.entries.type') . '?entry=' . $this->getEntriesQuery($request->getQueryParams()['entry']), + 'title' => __('admin_type'), + 'attributes' => ['class' => 'navbar-item active'] + ] + ] + ]); } public function move($request, $response, $args) From 6d6a8e0eedce79007e8937627e4a77a55f37c7cf Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 12:32:45 +0300 Subject: [PATCH 0745/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../views/templates/content/entries/type.html | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 site/plugins/admin/views/templates/content/entries/type.html diff --git a/site/plugins/admin/views/templates/content/entries/type.html b/site/plugins/admin/views/templates/content/entries/type.html new file mode 100644 index 00000000..2f1383ea --- /dev/null +++ b/site/plugins/admin/views/templates/content/entries/type.html @@ -0,0 +1,24 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+
+
+ + + +
+ + +
+
+ +
+ +
+
+{% endblock %} From 18a9c1c15f84d513f023bc25d3ae690078eb96c9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 12:33:04 +0300 Subject: [PATCH 0746/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/views/templates/content/entries/add.html | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/views/templates/content/entries/add.html b/site/plugins/admin/views/templates/content/entries/add.html index 60edb68d..82d267b2 100644 --- a/site/plugins/admin/views/templates/content/entries/add.html +++ b/site/plugins/admin/views/templates/content/entries/add.html @@ -4,7 +4,6 @@
-
From ec58006b2e62382e226a61f21e0acd79f18ab555 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 14:07:38 +0300 Subject: [PATCH 0747/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../templates/content/entries/index.html | 10 ++++---- .../templates/content/entries/rename.html | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 site/plugins/admin/views/templates/content/entries/rename.html diff --git a/site/plugins/admin/views/templates/content/entries/index.html b/site/plugins/admin/views/templates/content/entries/index.html index d4245d6b..f38bced2 100644 --- a/site/plugins/admin/views/templates/content/entries/index.html +++ b/site/plugins/admin/views/templates/content/entries/index.html @@ -42,12 +42,12 @@ Toggle Dropdown
{{ tr('admin_delete') }} diff --git a/site/plugins/admin/views/templates/content/entries/rename.html b/site/plugins/admin/views/templates/content/entries/rename.html new file mode 100644 index 00000000..081c16f8 --- /dev/null +++ b/site/plugins/admin/views/templates/content/entries/rename.html @@ -0,0 +1,25 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+
+ + + + + + + + +
+ + +
+ +
+ +
+ +
+
+{% endblock %} From 7d5c1d64b70c81bfdd36cdf9afb373df3efa674e Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 14:07:48 +0300 Subject: [PATCH 0748/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../app/Controllers/EntriesController.php | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 1df5cfa0..990eecc8 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -187,6 +187,7 @@ class EntriesController extends Controller return $this->view->render($response, 'plugins/admin/views/templates/content/entries/type.html', [ 'fieldset' => $entry['fieldset'], + 'entry' => $this->getEntriesQuery($request->getQueryParams()['entry']), 'fieldsets' => $fieldsets, 'menu_item' => 'entries', 'links' => [ @@ -204,6 +205,36 @@ class EntriesController extends Controller ]); } + public function typeProcess($request, $response, $args) + { + + $data = []; + + $_data = $request->getParsedBody(); + $entry_name = $_data['entry']; + $entry = $this->entries->fetch($_data['entry']); + + Arr::delete($entry, 'slug'); + Arr::delete($_data, 'csrf_name'); + Arr::delete($_data, 'csrf_value'); + Arr::delete($_data, 'type_entry'); + Arr::delete($_data, 'entry'); + + $data = array_merge($entry, $_data); + + if ($this->entries->update( + $entry_name, + $data + )) { + $this->flash->addMessage('success', __('admin_message_entry_changes_saved')); + } else { + $this->flash->addMessage('success', __('admin_message_entry_was_not_moved')); + } + + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $data['parent_entry']); + } + + public function move($request, $response, $args) { @@ -211,6 +242,40 @@ class EntriesController extends Controller public function rename($request, $response, $args) { + return $this->view->render($response, + 'plugins/admin/views/templates/content/entries/rename.html', [ + 'name_current' => Arr::last(explode("/", $this->getEntriesQuery($request->getQueryParams()['entry']))), + 'entry_path_current' => $this->getEntriesQuery($request->getQueryParams()['entry']), + 'entry_parent' => implode('/', array_slice(explode("/", $this->getEntriesQuery($request->getQueryParams()['entry'])), 0, -1)), + 'menu_item' => 'entries', + 'links' => [ + 'entries' => [ + 'link' => $this->router->urlFor('admin.entries.index'), + 'title' => __('admin_entries'), + 'attributes' => ['class' => 'navbar-item'] + ], + 'entries_type' => [ + 'link' => $this->router->urlFor('admin.entries.rename') . '?entry=' . $this->getEntriesQuery($request->getQueryParams()['entry']), + 'title' => __('admin_rename'), + 'attributes' => ['class' => 'navbar-item active'] + ] + ] + ]); + } + public function renameProcess($request, $response, $args) + { + $data = $request->getParsedBody(); + + if ($this->entries->rename( + $data['entry_path_current'], + $data['entry_parent'] . '/' . Text::safeString($data['name'], '-', true) + )) { + $this->flash->addMessage('success', __('admin_message_entry_renamed')); + } else { + $this->flash->addMessage('success', __('admin_message_entry_was_not_created')); + } + + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $data['parent_entry']); } } From 1c088da7bdcad55c748fd19f54a86cb3cbd0b799 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 14:08:18 +0300 Subject: [PATCH 0749/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/routes.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/routes.php b/site/plugins/admin/routes.php index 316d4bd1..e6de5612 100644 --- a/site/plugins/admin/routes.php +++ b/site/plugins/admin/routes.php @@ -18,7 +18,10 @@ $app->post('/admin/plugins/change-status', 'PluginsController:changeStatus')->se $app->get('/admin/entries', 'EntriesController:index')->setName('admin.entries.index'); $app->get('/admin/entries/edit', 'EntriesController:index')->setName('admin.entries.edit'); $app->get('/admin/entries/add', 'EntriesController:add')->setName('admin.entries.add'); -$app->get('/admin/entries/move', 'EntriesController:index')->setName('admin.entries.move'); -$app->get('/admin/entries/rename', 'EntriesController:index')->setName('admin.entries.rename'); -$app->get('/admin/entries/type', 'EntriesController:index')->setName('admin.entries.type'); +$app->post('/admin/entries/add', 'EntriesController:addProcess')->setName('admin.entries.addProcess'); +$app->get('/admin/entries/move', 'EntriesController:move')->setName('admin.entries.move'); +$app->get('/admin/entries/rename', 'EntriesController:rename')->setName('admin.entries.rename'); +$app->post('/admin/entries/rename', 'EntriesController:renameProcess')->setName('admin.entries.renameProcess'); +$app->get('/admin/entries/type', 'EntriesController:type')->setName('admin.entries.type'); +$app->post('/admin/entries/type', 'EntriesController:typeProcess')->setName('admin.entries.typeProcess'); $app->get('/admin/entries/duplicate', 'EntriesController:index')->setName('admin.entries.duplicate'); From 24bc58471d800ff7fbedfdc17546ff49572a02c9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 19:01:45 +0300 Subject: [PATCH 0750/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/routes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/routes.php b/site/plugins/admin/routes.php index e6de5612..421a879c 100644 --- a/site/plugins/admin/routes.php +++ b/site/plugins/admin/routes.php @@ -20,6 +20,7 @@ $app->get('/admin/entries/edit', 'EntriesController:index')->setName('admin.entr $app->get('/admin/entries/add', 'EntriesController:add')->setName('admin.entries.add'); $app->post('/admin/entries/add', 'EntriesController:addProcess')->setName('admin.entries.addProcess'); $app->get('/admin/entries/move', 'EntriesController:move')->setName('admin.entries.move'); +$app->post('/admin/entries/move', 'EntriesController:moveProcess')->setName('admin.entries.moveProcess'); $app->get('/admin/entries/rename', 'EntriesController:rename')->setName('admin.entries.rename'); $app->post('/admin/entries/rename', 'EntriesController:renameProcess')->setName('admin.entries.renameProcess'); $app->get('/admin/entries/type', 'EntriesController:type')->setName('admin.entries.type'); From d301dcad0e97534c3a07cd9ba5b28a8ad8f61ff9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 19:02:12 +0300 Subject: [PATCH 0751/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../views/templates/content/entries/move.html | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 site/plugins/admin/views/templates/content/entries/move.html diff --git a/site/plugins/admin/views/templates/content/entries/move.html b/site/plugins/admin/views/templates/content/entries/move.html new file mode 100644 index 00000000..f08ce944 --- /dev/null +++ b/site/plugins/admin/views/templates/content/entries/move.html @@ -0,0 +1,26 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+
+
+ + + + + +
+ + +
+
+ +
+ +
+
+{% endblock %} From 58622151ae790ba755025a6e3e55aba32ce25fe7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 19:10:57 +0300 Subject: [PATCH 0752/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../app/Controllers/EntriesController.php | 56 ++++++++++++++++++- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 990eecc8..2c570aed 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -221,7 +221,7 @@ class EntriesController extends Controller Arr::delete($_data, 'entry'); $data = array_merge($entry, $_data); - + if ($this->entries->update( $entry_name, $data @@ -231,13 +231,63 @@ class EntriesController extends Controller $this->flash->addMessage('success', __('admin_message_entry_was_not_moved')); } - return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $data['parent_entry']); + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . implode('/', array_slice(explode("/", $entry_name), 0, -1))); } - public function move($request, $response, $args) { + $entry_name = $this->getEntriesQuery($request->getQueryParams()['entry']); + $entry = $this->entries->fetch($this->getEntriesQuery($request->getQueryParams()['entry'])); + $_entries_list = $this->entries->fetchAll('', 'slug'); + $entries_list['/'] = '/'; + foreach ($_entries_list as $_entry) { + if ($_entry['slug'] != '') { + $entries_list[$_entry['slug']] = $_entry['slug']; + } else { + $entries_list[$this->registry->get('settings.entries.main')] = $this->registry->get('settings.entries.main'); + } + } + + return $this->view->render($response, + 'plugins/admin/views/templates/content/entries/move.html', [ + 'entry_path_current' => $entry_name, + 'entries_list' => $entries_list, + 'name_current' => Arr::last(explode("/", $entry_name)), + 'entry_parent' => implode('/', array_slice(explode("/", $entry_name), 0, -1)), + 'menu_item' => 'entries', + 'links' => [ + 'entries' => [ + 'link' => $this->router->urlFor('admin.entries.index'), + 'title' => __('admin_entries'), + 'attributes' => ['class' => 'navbar-item'] + ], + 'entries_move' => [ + 'link' => $this->router->urlFor('admin.entries.move'), + 'title' => __('admin_move'), + 'attributes' => ['class' => 'navbar-item active'] + ] + ] + ]); + } + + public function moveProcess($request, $response, $args) + { + + $data = $request->getParsedBody(); + + if (!$this->entries->has($data['parent_entry'] . '/' . $data['name_current'])) { + if ($this->entries->rename( + $data['entry_path_current'], + $data['parent_entry'] . '/' . Text::safeString($data['name_current'], '-', true) + )) { + $this->flash->addMessage('success', __('admin_message_entry_moved')); + } else { + $this->flash->addMessage('success', __('admin_message_entry_was_not_moved')); + } + + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $data['parent_entry']); + } } public function rename($request, $response, $args) From 62daf161e6eb3ef962db6745de6a5b6a0d3f818f Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 19:34:46 +0300 Subject: [PATCH 0753/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../app/Controllers/EntriesController.php | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 2c570aed..02e95bc5 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -28,6 +28,7 @@ class EntriesController extends Controller return $this->view->render($response, 'plugins/admin/views/templates/content/entries/index.html', [ 'entries_list' => $this->entries->fetchAll($this->getEntriesQuery($request->getQueryParams()['entry']), 'date', 'DESC'), + 'entry_current' => $this->getEntriesQuery($request->getQueryParams()['entry']), 'menu_item' => 'entries', 'links' => [ 'entries' => [ @@ -328,4 +329,23 @@ class EntriesController extends Controller return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $data['parent_entry']); } + + public function deleteProcess($request, $response, $args) + { + $entry_name = $this->getEntriesQuery($request->getQueryParams()['entry']); + $entry_name_current = $this->getEntriesQuery($request->getQueryParams()['entry_current']); + + if ($this->entries->delete($entry_name)) { + $this->flash->addMessage('success', __('admin_message_entry_deleted')); + } else { + $this->flash->addMessage('success', __('admin_message_entry_was_not_deleted')); + } + + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . $entry_name_current); + } + + public function duplicateProcess($request, $response, $args) + { + + } } From 76257caa8827752fcfa74e0bef8cfa2a669e3904 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 19:34:52 +0300 Subject: [PATCH 0754/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../views/templates/content/entries/add.php | 57 ------------- .../templates/content/entries/index.html | 4 +- .../views/templates/content/entries/list.php | 83 ------------------- .../views/templates/content/entries/move.html | 2 +- .../views/templates/content/entries/move.php | 44 ---------- .../templates/content/entries/rename.php | 46 ---------- .../views/templates/content/entries/type.php | 42 ---------- 7 files changed, 3 insertions(+), 275 deletions(-) delete mode 100644 site/plugins/admin/views/templates/content/entries/add.php delete mode 100644 site/plugins/admin/views/templates/content/entries/list.php delete mode 100644 site/plugins/admin/views/templates/content/entries/move.php delete mode 100644 site/plugins/admin/views/templates/content/entries/rename.php delete mode 100644 site/plugins/admin/views/templates/content/entries/type.php diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php deleted file mode 100644 index c9340bcd..00000000 --- a/site/plugins/admin/views/templates/content/entries/add.php +++ /dev/null @@ -1,57 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'entries_add' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/add?entry=' . Http::get('entry'), - 'title' => __('admin_create_new_entry'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - -
- 'entryTitle']) ?> - 'form-control', 'id' => 'entryTitle', 'required', 'data-validation' => 'length required', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
-
- 'entrySlug']) ?> - 'form-control', 'id' => 'entrySlug', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?> -
-
- - -
-
-
- - 'btn btn-black']) ?> - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/content/entries/index.html b/site/plugins/admin/views/templates/content/entries/index.html index f38bced2..a68e7ec1 100644 --- a/site/plugins/admin/views/templates/content/entries/index.html +++ b/site/plugins/admin/views/templates/content/entries/index.html @@ -43,14 +43,14 @@
- {{ tr('admin_delete') }} + {{ tr('admin_delete') }} {% endfor %} diff --git a/site/plugins/admin/views/templates/content/entries/list.php b/site/plugins/admin/views/templates/content/entries/list.php deleted file mode 100644 index c3968a63..00000000 --- a/site/plugins/admin/views/templates/content/entries/list.php +++ /dev/null @@ -1,83 +0,0 @@ - - - -display() ?> -assign('links', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/add?entry=' . Http::get('entry'), - 'title' => __('admin_create_new_entry'), - 'attributes' => ['class' => 'float-right btn'] - ] - ]) - ->display() -?> -display() ?> - - 0): ?> -
- + + + + + + + + + + + + + + + + 0): ?> () From ad4f44709c76e6519eafc0ea6f73d34013ff692c Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:08:26 +0300 Subject: [PATCH 0436/1219] Admin Panel: Entries Manager - start using Fieldsets default_field --- site/themes/default/fieldsets/about.yaml | 5 +++-- site/themes/default/fieldsets/blog-post.yaml | 3 ++- site/themes/default/fieldsets/blog.yaml | 3 ++- site/themes/default/fieldsets/default.yaml | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/site/themes/default/fieldsets/about.yaml b/site/themes/default/fieldsets/about.yaml index 36d7c1f8..d6f23fd7 100644 --- a/site/themes/default/fieldsets/about.yaml +++ b/site/themes/default/fieldsets/about.yaml @@ -1,4 +1,5 @@ title: About +default_field: title fields: title: title: admin_title @@ -8,7 +9,7 @@ fields: title: admin_content type: html size: col-12 - image: + image: title: admin_media type: media_select - size: col-3 \ No newline at end of file + size: col-3 diff --git a/site/themes/default/fieldsets/blog-post.yaml b/site/themes/default/fieldsets/blog-post.yaml index a158b19e..9d8641c3 100644 --- a/site/themes/default/fieldsets/blog-post.yaml +++ b/site/themes/default/fieldsets/blog-post.yaml @@ -1,10 +1,11 @@ title: 'Blog Post' +default_field: title fields: title: title: admin_title type: text size: col-12 - summary: + summary: title: admin_summary type: html size: col-12 diff --git a/site/themes/default/fieldsets/blog.yaml b/site/themes/default/fieldsets/blog.yaml index 6360bfb8..75aa6d9d 100644 --- a/site/themes/default/fieldsets/blog.yaml +++ b/site/themes/default/fieldsets/blog.yaml @@ -1,6 +1,7 @@ title: Blog +default_field: title fields: title: title: admin_title type: text - size: col-12 \ No newline at end of file + size: col-12 diff --git a/site/themes/default/fieldsets/default.yaml b/site/themes/default/fieldsets/default.yaml index 9591c62a..9b3b1e63 100644 --- a/site/themes/default/fieldsets/default.yaml +++ b/site/themes/default/fieldsets/default.yaml @@ -1,4 +1,5 @@ title: Default +default_field: title sections: main: title: 'Main' From 0e8c88857092c161bd7bd1e9b92bac1014a013c7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:09:57 +0300 Subject: [PATCH 0437/1219] Admin Panel: Entries Manager - start using Fieldsets default_field --- site/entries/home/entry.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/site/entries/home/entry.yaml b/site/entries/home/entry.yaml index e0399e9a..8a674300 100644 --- a/site/entries/home/entry.yaml +++ b/site/entries/home/entry.yaml @@ -1,15 +1,15 @@ -title: Home -template: home -visibility: visible -fieldset: default -content: | -

- Welcome! -

-

- Welcome to your new Flextype powered website. -
- Flextype is succesfully installed, you can start editing the content and customising your site in Admin panel. -

-
-

Latest blog posts:

+title: Home +template: home +fieldset: default +visibility: visible +content: | +

+ Welcome! +

+

+ Welcome to your new Flextype powered website. +
+ Flextype is succesfully installed, you can start editing the content and customising your site in Admin panel. +

+
+

Latest blog posts:

From 9ca1a428e908eecf0664ffd109137d4f10bbee5f Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:17:37 +0300 Subject: [PATCH 0438/1219] Admin Panel: General - code cleanup and refactoring. --- site/plugins/admin/classes/EntriesManager.php | 2 ++ site/plugins/admin/classes/FieldsetsManager.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 4b209666..1def8660 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -58,6 +58,7 @@ class EntriesManager public static function getMediaList($entry, $path = false) { $files = []; + foreach (array_diff(scandir(PATH['entries'] . '/' . $entry), ['..', '.']) as $file) { if (strpos(Registry::get('settings.entries.media.accept_file_types'), $file_ext = substr(strrchr($file, '.'), 1)) !== false) { if (strpos($file, strtolower($file_ext), 1)) { @@ -69,6 +70,7 @@ class EntriesManager } } } + return $files; } diff --git a/site/plugins/admin/classes/FieldsetsManager.php b/site/plugins/admin/classes/FieldsetsManager.php index 3ed007e7..7027733e 100644 --- a/site/plugins/admin/classes/FieldsetsManager.php +++ b/site/plugins/admin/classes/FieldsetsManager.php @@ -37,7 +37,7 @@ class FieldsetsManager 'type' => 'text', 'size' => 'col-12' ] - ] + ] ]) )) { Notification::set('success', __('admin_message_fieldset_created')); From 23e153856a29c1ec5ce6b0de2ac99c926fef70e4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:36:13 +0300 Subject: [PATCH 0439/1219] Flextype Core: Default Theme - fieldsets - improvements --- site/themes/default/fieldsets/about.yaml | 29 +++++++++++--------- site/themes/default/fieldsets/blog-post.yaml | 29 +++++++++++--------- site/themes/default/fieldsets/blog.yaml | 13 +++++---- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/site/themes/default/fieldsets/about.yaml b/site/themes/default/fieldsets/about.yaml index d6f23fd7..eaca1a4b 100644 --- a/site/themes/default/fieldsets/about.yaml +++ b/site/themes/default/fieldsets/about.yaml @@ -1,15 +1,18 @@ title: About default_field: title -fields: - title: - title: admin_title - type: text - size: col-12 - content: - title: admin_content - type: html - size: col-12 - image: - title: admin_media - type: media_select - size: col-3 +sections: + main: + title: 'Main' + fields: + title: + title: admin_title + type: text + size: col-12 + content: + title: admin_content + type: html + size: col-12 + image: + title: admin_media + type: media_select + size: col-3 diff --git a/site/themes/default/fieldsets/blog-post.yaml b/site/themes/default/fieldsets/blog-post.yaml index 9d8641c3..748ac619 100644 --- a/site/themes/default/fieldsets/blog-post.yaml +++ b/site/themes/default/fieldsets/blog-post.yaml @@ -1,15 +1,18 @@ title: 'Blog Post' default_field: title -fields: - title: - title: admin_title - type: text - size: col-12 - summary: - title: admin_summary - type: html - size: col-12 - content: - title: admin_content - type: html - size: col-12 +sections: + main: + title: 'Main' + fields: + title: + title: admin_title + type: text + size: col-12 + summary: + title: admin_summary + type: html + size: col-12 + content: + title: admin_content + type: html + size: col-12 diff --git a/site/themes/default/fieldsets/blog.yaml b/site/themes/default/fieldsets/blog.yaml index 75aa6d9d..e27b506f 100644 --- a/site/themes/default/fieldsets/blog.yaml +++ b/site/themes/default/fieldsets/blog.yaml @@ -1,7 +1,10 @@ title: Blog default_field: title -fields: - title: - title: admin_title - type: text - size: col-12 +sections: + main: + title: 'Main' + fields: + title: + title: admin_title + type: text + size: col-12 From 0cc5dd18778c1497211c23771e4f3300f4d6246d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:38:12 +0300 Subject: [PATCH 0440/1219] Flextype Core: Default Theme - fieldsets - improvements --- site/themes/default/fieldsets/about.yaml | 31 ++++++++++++++++++++ site/themes/default/fieldsets/blog-post.yaml | 7 +++++ site/themes/default/fieldsets/blog.yaml | 31 ++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/site/themes/default/fieldsets/about.yaml b/site/themes/default/fieldsets/about.yaml index eaca1a4b..0eb91be5 100644 --- a/site/themes/default/fieldsets/about.yaml +++ b/site/themes/default/fieldsets/about.yaml @@ -16,3 +16,34 @@ sections: title: admin_media type: media_select size: col-3 + seo: + title: 'Seo' + fields: + description: + title: admin_description + type: textarea + size: col-12 + menu: + title: 'Menu' + fields: + menu_item_title: + title: admin_menu_item_title + type: text + size: col-4 + menu_item_url: + title: admin_menu_item_url + type: text + size: col-4 + menu_item_target: + title: admin_menu_item_target + type: select + options: + blank: '_blank' + self: '_self' + parent: '_parent' + top: '_top' + size: col-4 + menu_item_order: + title: admin_menu_item_order + type: text + size: col-4 diff --git a/site/themes/default/fieldsets/blog-post.yaml b/site/themes/default/fieldsets/blog-post.yaml index 748ac619..b6bf4b3e 100644 --- a/site/themes/default/fieldsets/blog-post.yaml +++ b/site/themes/default/fieldsets/blog-post.yaml @@ -16,3 +16,10 @@ sections: title: admin_content type: html size: col-12 + seo: + title: 'Seo' + fields: + description: + title: admin_description + type: textarea + size: col-12 diff --git a/site/themes/default/fieldsets/blog.yaml b/site/themes/default/fieldsets/blog.yaml index e27b506f..3384c995 100644 --- a/site/themes/default/fieldsets/blog.yaml +++ b/site/themes/default/fieldsets/blog.yaml @@ -8,3 +8,34 @@ sections: title: admin_title type: text size: col-12 + seo: + title: 'Seo' + fields: + description: + title: admin_description + type: textarea + size: col-12 + menu: + title: 'Menu' + fields: + menu_item_title: + title: admin_menu_item_title + type: text + size: col-4 + menu_item_url: + title: admin_menu_item_url + type: text + size: col-4 + menu_item_target: + title: admin_menu_item_target + type: select + options: + blank: '_blank' + self: '_self' + parent: '_parent' + top: '_top' + size: col-4 + menu_item_order: + title: admin_menu_item_order + type: text + size: col-4 From ebf8ffb1c4544ebd80a1ce65a52e918ee2e54b65 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:45:51 +0300 Subject: [PATCH 0441/1219] Admin Panel: Entries Manager - content field removed. --- site/plugins/admin/classes/EntriesManager.php | 7 +------ .../admin/views/templates/content/entries/content.php | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 1def8660..2f0fda0b 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -74,7 +74,7 @@ class EntriesManager return $files; } - public static function displayEntryForm(array $fieldsets, array $values = [], string $content) + public static function displayEntryForm(array $fieldsets, array $values = []) { echo Form::open(null, ['id' => 'form']); echo Form::hidden('token', Token::generate()); @@ -152,11 +152,6 @@ class EntriesManager $form_element = Form::textarea($element, $form_value, $property['attributes']); break; - // A specific WYSIWYG HTML field for entry content editing - case 'content': - $form_element = Form::textarea($element, $content, $property['attributes']); - break; - // Selectbox field case 'select': $form_element = Form::select($form_element_name, $property['options'], $form_value, $property['attributes']); diff --git a/site/plugins/admin/views/templates/content/entries/content.php b/site/plugins/admin/views/templates/content/entries/content.php index cf8a4d12..9286995d 100644 --- a/site/plugins/admin/views/templates/content/entries/content.php +++ b/site/plugins/admin/views/templates/content/entries/content.php @@ -43,7 +43,7 @@ Themes::view('admin/views/partials/navbar') ->display(); Themes::view('admin/views/partials/content-start')->display(); -EntriesManager::displayEntryForm($fieldset, $entry, $entry['content']); +EntriesManager::displayEntryForm($fieldset, $entry); Themes::view('admin/views/partials/content-end')->display(); Themes::view('admin/views/partials/footer')->display(); From 33e18fa1614b9e36b308f1cb14a07c34bfcb776b Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 21:48:49 +0300 Subject: [PATCH 0442/1219] CHANGELOG UPDATES --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47b33d2b..07adfc03 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## [0.8.4] - 2019-01-xx +## [0.9.0] - 2019-02-xx ### Added - Flextype Core: Shortcodes class to work with shortcodes and default shortcodes. - Shortcodes: new default shortcode [site_url] From de471c099a710e6ae9d798d88bb7146097226adc Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 22:23:44 +0300 Subject: [PATCH 0443/1219] - Flextype Core: Symfony Yaml updated to 4.2.3. - Flextype Core: Thunderer Shortcode updated to 0.7.1. - Flextype Core: Flextype Components Arr updated to 1.2.5 - Flextype Core: Flextype Components Number updated to 1.1.0 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index da9e27f3..c5ab7002 100755 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=7.1.3", "doctrine/cache": "1.8.0", - "symfony/yaml": "4.2.2", - "thunderer/shortcode": "0.7.0", + "symfony/yaml": "4.2.3", + "thunderer/shortcode": "0.7.1", "flextype-components/arr" : "1.2.5", "flextype-components/assets" : "1.0.3", "flextype-components/cookie" : "1.2.0", @@ -32,7 +32,7 @@ "flextype-components/i18n" : "1.2.0", "flextype-components/http" : "1.1.1", "flextype-components/html" : "1.0.0", - "flextype-components/number" : "1.0.0", + "flextype-components/number" : "1.1.0", "flextype-components/notification" : "1.0.2", "flextype-components/registry" : "1.1.0", "flextype-components/session" : "1.1.1", From 5c78e70d3b86f15a0578b7b0d72571caa950ed52 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 22:32:38 +0300 Subject: [PATCH 0444/1219] - Admin Panel: Bootstrap updated to 4.3.1 - Admin Panel: Codemirror updated to 5.43.0 - Admin Panel: Trumbowyg updated to 2.14.0 --- site/plugins/admin/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/package.json b/site/plugins/admin/package.json index 502024ec..6725570c 100755 --- a/site/plugins/admin/package.json +++ b/site/plugins/admin/package.json @@ -3,8 +3,8 @@ "version": "0.0.0", "devDependencies": { "animate.css": "^3.7.0", - "bootstrap": "^4.2.1", - "codemirror": "5.42.0", + "bootstrap": "^4.3.1", + "codemirror": "5.43.0", "del": "^3.0.0", "es6-promise": "^4.2.5", "gulp": "^3.9.1", @@ -17,7 +17,7 @@ "messenger-hubspot": "1.5.0-b2", "popper.js": "^1.14.6", "run-sequence": "^2.2.1", - "trumbowyg": "^2.13.0", + "trumbowyg": "^2.14.0", "clipboard": "^2.0.4", "bs-custom-file-input": "^1.3.1" } From 01b32e84976640df1192de90aec648999ab747d1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 22:32:51 +0300 Subject: [PATCH 0445/1219] CHANGELOG UPDATES --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07adfc03..4e525cee 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,13 @@ - Flextype Core: Using new languages files format. ### Changed +- Flextype Core: Symfony Yaml updated to 4.2.3. +- Flextype Core: Thunderer Shortcode updated to 0.7.1. - Flextype Core: Flextype Components Arr updated to 1.2.5 +- Flextype Core: Flextype Components Number updated to 1.1.0 +- Admin Panel: Bootstrap updated to 4.3.1 +- Admin Panel: Codemirror updated to 5.43.0 +- Admin Panel: Trumbowyg updated to 2.14.0 - Admin Panel: Settings Manager - locales list - improvements! ### Fixed From 08fabcb418433d649f023c2e07397518a5641da5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 22:35:19 +0300 Subject: [PATCH 0446/1219] Admin Panel: General - code cleanup and refactoring. --- site/plugins/admin/classes/EntriesManager.php | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 2f0fda0b..566b9420 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -3,7 +3,6 @@ namespace Flextype; use Flextype\Component\Arr\Arr; -use Flextype\Component\Number\Number; use Flextype\Component\I18n\I18n; use Flextype\Component\Http\Http; use Flextype\Component\Event\Event; From c2802421c462a1981d1e85cefae8b435521b2900 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 23:10:32 +0300 Subject: [PATCH 0447/1219] Admin Panel: Fieldsets Manager - cleanup and refactoring --- .../admin/classes/FieldsetsManager.php | 226 ++++++++++-------- 1 file changed, 127 insertions(+), 99 deletions(-) diff --git a/site/plugins/admin/classes/FieldsetsManager.php b/site/plugins/admin/classes/FieldsetsManager.php index 7027733e..5e994973 100644 --- a/site/plugins/admin/classes/FieldsetsManager.php +++ b/site/plugins/admin/classes/FieldsetsManager.php @@ -18,116 +18,144 @@ class FieldsetsManager switch (Http::getUriSegment(2)) { case 'add': - $create_fieldset = Http::post('create_fieldset'); - - if (isset($create_fieldset)) { - if (Token::check((Http::post('token')))) { - - $file = PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Text::safeString(Http::post('name'), '-', true) . '.yaml'; - - if (!Filesystem::has($file)) { - // Create a fieldset! - if (Filesystem::write( - $file, - YamlParser::encode([ - 'title' => Http::post('title'), - 'fields' => [ - 'title' => [ - 'title' => 'admin_title', - 'type' => 'text', - 'size' => 'col-12' - ] - ] - ]) - )) { - Notification::set('success', __('admin_message_fieldset_created')); - Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/fieldsets/add') - ->display(); + FieldsetsManager::addFieldsets(); break; case 'delete': - if (Http::get('fieldset') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::delete(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '.yaml'); - Notification::set('success', __('admin_message_fieldset_deleted')); - Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + FieldsetsManager::deleteFieldsets(); break; case 'rename': - $rename_fieldset = Http::post('rename_fieldset'); - - if (isset($rename_fieldset)) { - if (Token::check((Http::post('token')))) { - if (!Filesystem::has(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name') . '.yaml')) { - if (rename( - PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name_current') . '.yaml', - PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name') . '.yaml') - ) { - Notification::set('success', __('admin_message_fieldset_renamed')); - Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/fieldsets/rename') - ->assign('name_current', Http::get('fieldset')) - ->display(); + FieldsetsManager::renameFieldsets(); break; case 'duplicate': - if (Http::get('fieldset') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::copy(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '.yaml', - PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '-duplicate-' . date("Ymd_His") . '.yaml'); - Notification::set('success', __('admin_message_fieldset_duplicated')); - Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + FieldsetsManager::duplicateFieldsets(); break; case 'edit': - $action = Http::post('action'); - - if (isset($action) && $action == 'save-form') { - if (Token::check((Http::post('token')))) { - - // Save a fieldset! - if (Filesystem::write( - PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name') . '.yaml', - Http::post('fieldset') - )) { - Notification::set('success', __('admin_message_fieldset_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/fieldsets/edit?fieldset=' . Http::post('name')); - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/fieldsets/edit') - ->assign('fieldset', Filesystem::read(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '.yaml')) - ->display(); + FieldsetsManager::editFieldsets(); break; default: - $fieldsets_list = Themes::getFieldsets(); - - Themes::view('admin/views/templates/extends/fieldsets/list') - ->assign('fieldsets_list', $fieldsets_list) - ->display(); + FieldsetsManager::listFieldsets(); break; } } + + protected static function addFieldsets() + { + $create_fieldset = Http::post('create_fieldset'); + + if (isset($create_fieldset)) { + if (Token::check((Http::post('token')))) { + + $file = PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Text::safeString(Http::post('name'), '-', true) . '.yaml'; + + if (!Filesystem::has($file)) { + // Create a fieldset! + if (Filesystem::write( + $file, + YamlParser::encode([ + 'title' => Http::post('title'), + 'fields' => [ + 'title' => [ + 'title' => 'admin_title', + 'type' => 'text', + 'size' => 'col-12' + ] + ] + ]) + )) { + Notification::set('success', __('admin_message_fieldset_created')); + Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); + } + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/extends/fieldsets/add') + ->display(); + } + + protected static function renameFieldsets() + { + $rename_fieldset = Http::post('rename_fieldset'); + + if (isset($rename_fieldset)) { + if (Token::check((Http::post('token')))) { + if (!Filesystem::has(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name') . '.yaml')) { + if (rename( + PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name_current') . '.yaml', + PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name') . '.yaml') + ) { + Notification::set('success', __('admin_message_fieldset_renamed')); + Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); + } + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/extends/fieldsets/rename') + ->assign('name_current', Http::get('fieldset')) + ->display(); + } + + protected static function duplicateFieldsets() + { + if (Http::get('fieldset') != '') { + if (Token::check((Http::get('token')))) { + Filesystem::copy(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '.yaml', + PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '-duplicate-' . date("Ymd_His") . '.yaml'); + Notification::set('success', __('admin_message_fieldset_duplicated')); + Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + + protected static function deleteFieldsets() + { + if (Http::get('fieldset') != '') { + if (Token::check((Http::get('token')))) { + Filesystem::delete(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '.yaml'); + Notification::set('success', __('admin_message_fieldset_deleted')); + Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + + protected static function editFieldsets() + { + $action = Http::post('action'); + + if (isset($action) && $action == 'save-form') { + if (Token::check((Http::post('token')))) { + + // Save a fieldset! + if (Filesystem::write( + PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('name') . '.yaml', + Http::post('fieldset') + )) { + Notification::set('success', __('admin_message_fieldset_saved')); + Http::redirect(Http::getBaseUrl() . '/admin/fieldsets/edit?fieldset=' . Http::post('name')); + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/extends/fieldsets/edit') + ->assign('fieldset', Filesystem::read(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::get('fieldset') . '.yaml')) + ->display(); + } + + protected static function listFieldsets() + { + Themes::view('admin/views/templates/extends/fieldsets/list') + ->assign('fieldsets_list', Themes::getFieldsets()) + ->display(); + } } From 5c495a2872c3932eadddb00ad2bfbdcfef32b33a Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 23:12:44 +0300 Subject: [PATCH 0448/1219] Admin Panel: Fieldsets Manager - cleanup and refactoring --- site/plugins/admin/classes/FieldsetsManager.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/site/plugins/admin/classes/FieldsetsManager.php b/site/plugins/admin/classes/FieldsetsManager.php index 5e994973..f03afa59 100644 --- a/site/plugins/admin/classes/FieldsetsManager.php +++ b/site/plugins/admin/classes/FieldsetsManager.php @@ -51,16 +51,7 @@ class FieldsetsManager // Create a fieldset! if (Filesystem::write( $file, - YamlParser::encode([ - 'title' => Http::post('title'), - 'fields' => [ - 'title' => [ - 'title' => 'admin_title', - 'type' => 'text', - 'size' => 'col-12' - ] - ] - ]) + YamlParser::encode(['title' => Http::post('title')]) )) { Notification::set('success', __('admin_message_fieldset_created')); Http::redirect(Http::getBaseUrl() . '/admin/fieldsets'); From 9c009b1316be656d2ed45a9cdb8eccd2b22ada36 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 23:29:44 +0300 Subject: [PATCH 0449/1219] Admin Panel: Fieldsets Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 566b9420..8b16f203 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -511,9 +511,26 @@ class EntriesManager $entry = Entries::fetch(Http::get('entry')); + $fieldsets = []; + + // Get fieldsets files + $_fieldsets = Filesystem::listContents(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/'); + + // If there is any template file then go... + if (count($_fieldsets) > 0) { + foreach ($_fieldsets as $fieldset) { + if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'yaml') { + $fieldset_content = YamlParser::decode(Filesystem::read($fieldset['path'])); + if (isset($fieldset_content['sections']) && isset($fieldset_content['sections']['main']) && isset($fieldset_content['sections']['main']['fields'])) { + $fieldsets[$fieldset['basename']] = $fieldset_content['title']; + } + } + } + } + Themes::view('admin/views/templates/content/entries/type') ->assign('fieldset', $entry['fieldset']) - ->assign('fieldsets', Themes::getFieldsets()) + ->assign('fieldsets', $fieldsets) ->display(); } @@ -611,8 +628,25 @@ class EntriesManager } } + $fieldsets = []; + + // Get fieldsets files + $_fieldsets = Filesystem::listContents(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/'); + + // If there is any template file then go... + if (count($_fieldsets) > 0) { + foreach ($_fieldsets as $fieldset) { + if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'yaml') { + $fieldset_content = YamlParser::decode(Filesystem::read($fieldset['path'])); + if (isset($fieldset_content['sections']) && isset($fieldset_content['sections']['main']) && isset($fieldset_content['sections']['main']['fields'])) { + $fieldsets[$fieldset['basename']] = $fieldset_content['title']; + } + } + } + } + Themes::view('admin/views/templates/content/entries/add') - ->assign('fieldsets', Themes::getFieldsets(false)) + ->assign('fieldsets', $fieldsets) ->assign('entries_list', Entries::fetchAll('', 'slug')) ->display(); } From 558812696752aa2a7e5050c856a76f7caf52e16c Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 23:32:31 +0300 Subject: [PATCH 0450/1219] Flextype Core: Frontmatter Parser - removed. --- flextype/parsers/FrontmatterParser.php | 37 -------------------------- 1 file changed, 37 deletions(-) delete mode 100644 flextype/parsers/FrontmatterParser.php diff --git a/flextype/parsers/FrontmatterParser.php b/flextype/parsers/FrontmatterParser.php deleted file mode 100644 index 78aa090d..00000000 --- a/flextype/parsers/FrontmatterParser.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @link http://flextype.org - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flextype; - -class FrontmatterParser { - - /** - * Get [matter] and [body] from a content. - * PHP implementation of Jekyll Front Matter. - * - * $content = Entries::frontMatterParser($content); - * - * @param string $content Content to parse - * @access public - * @return array - */ - public static function parse(string $content) : array - { - $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL . ltrim($content)); - - if (count($parts) < 3) { - return ['matter' => [], 'body' => $content]; - } - - return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2))]; - } -} From b806fb1b8c4ea4a72b4d4c6a4897233564e85ff7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 23:43:08 +0300 Subject: [PATCH 0451/1219] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 8b16f203..46daaa2f 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -299,7 +299,7 @@ class EntriesManager if (isset($action) && $action == 'save-form') { if (Token::check((Http::post('token')))) { Filesystem::write( - PATH['entries'] . '/' . Http::post('entry_name') . '/entry.html', + PATH['entries'] . '/' . Http::post('entry_name') . '/entry.yaml', Http::post('entry_content') ); Notification::set('success', __('admin_message_entry_changes_saved')); @@ -309,7 +309,7 @@ class EntriesManager } } - $entry_content = Filesystem::read(PATH['entries'] . '/' . Http::get('entry') . '/entry.html'); + $entry_content = Filesystem::read(PATH['entries'] . '/' . Http::get('entry') . '/entry.yaml'); Themes::view('admin/views/templates/content/entries/source') ->assign('entry_name', Http::get('entry')) @@ -495,7 +495,7 @@ class EntriesManager $frontmatter = YamlParser::encode(array_merge($entry, $frontmatter)); if (Filesystem::write( - PATH['entries'] . '/' . Http::post('entry') . '/entry.html', + PATH['entries'] . '/' . Http::post('entry') . '/entry.нфьд', '---' . "\n" . $frontmatter . "\n" . '---' . "\n" . @@ -557,7 +557,7 @@ class EntriesManager // Try to create directory for new entry if (Filesystem::createDir($dir)) { - $file = $dir . '/entry.html'; + $file = $dir . '/entry.yaml'; // Check if new entry file exists if (!Filesystem::has($file)) { From 3f43c41a0bd50888bed38f6dd9645d986f58e5eb Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 01:47:47 +0300 Subject: [PATCH 0452/1219] Admin Panel: Entries Manager - cleanup and refactoring. --- site/plugins/admin/classes/EntriesManager.php | 114 ++++++++---------- 1 file changed, 51 insertions(+), 63 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 46daaa2f..cf60be20 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -545,83 +545,71 @@ class EntriesManager if (Http::post('parent_entry')) { $parent_entry = '/' . Http::post('parent_entry'); } else { - $parent_entry = ''; + $parent_entry = '/'; } - // Set new entry directory - $dir = PATH['entries'] . $parent_entry . '/' . Text::safeString(Http::post('slug'), '-', true); + // Set new entry name + $entry = $parent_entry . Text::safeString(Http::post('slug'), '-', true); // Check if new entry directory exists - if (!Filesystem::has($dir)) { + if (!Entries::has($entry)) { - // Try to create directory for new entry - if (Filesystem::createDir($dir)) { + // Get fieldset + $fieldset = YamlParser::decode(Filesystem::read(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('fieldset') . '.yaml')); - $file = $dir . '/entry.yaml'; + // We need to check if template for current fieldset is exists + // if template is not exist then default template will be used! + $template_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/views/templates/' . Http::post('fieldset') . '.php'; + if (Filesystem::has($template_path)) { + $template = Http::post('fieldset'); + } else { + $template = 'default'; + } - // Check if new entry file exists - if (!Filesystem::has($file)) { + // Init entry data + $data = []; + $default_data = []; - // Get fieldset - $fieldset = YamlParser::decode(Filesystem::read(PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . Http::post('fieldset') . '.yaml')); + // Define data values based on POST data + $default_data['title'] = Http::post('title'); + $default_data['template'] = $template; + $default_data['fieldset'] = Http::post('fieldset'); + $default_data['date'] = date(Registry::get('settings.date_format'), time()); - // We need to check if template for current fieldset is exists - // if template is not exist then default template will be used! - $template_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/views/templates/' . Http::post('fieldset') . '.php'; - if (Filesystem::has($template_path)) { - $template = Http::post('fieldset'); + // Define frontmatter values based on fieldset + foreach ($fieldset['sections'] as $section) { + foreach ($section as $key => $field) { + + // Get values from default frontmatter + if (isset($default_frontmatter[$key])) { + + $_value = $default_frontmatter[$key]; + + // Get values from fieldsets predefined field values + } elseif (isset($field['value'])) { + + $_value = $field['value']; + + // or set empty value } else { - $template = 'default'; + $_value = ''; } - // Init frontmatter - $frontmatter = []; - $default_frontmatter = []; - - // Define frontmatter values based on POST data - $default_frontmatter['title'] = Http::post('title'); - $default_frontmatter['template'] = $template; - $default_frontmatter['fieldset'] = Http::post('fieldset'); - $default_frontmatter['date'] = date(Registry::get('settings.date_format'), time()); - - // Define frontmatter values based on fieldset - foreach ($fieldset['sections'] as $section) { - foreach ($section as $key => $field) { - - // Get values from default frontmatter - if (isset($default_frontmatter[$key])) { - - $_value = $default_frontmatter[$key]; - - // Get values from fieldsets predefined field values - } elseif (isset($field['value'])) { - - $_value = $field['value']; - - // or set empty value - } else { - $_value = ''; - } - - $frontmatter[$key] = $_value; - } - } - - // Delete content field from frontmatter - Arr::delete($frontmatter, 'content'); - - // Create a entry! - if (Filesystem::write( - $file, - '---' . "\n" . - YamlParser::encode(array_replace_recursive($frontmatter, $default_frontmatter)) . - '---' . "\n" - )) { - Notification::set('success', __('admin_message_entry_created')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); - } + $data[$key] = $_value; } } + + // Delete content field from frontmatter + Arr::delete($data, 'content'); + + // Create a entry! + if (Entries::create( + $entry, + array_replace_recursive($data, $default_data) + )) { + Notification::set('success', __('admin_message_entry_created')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } } } else { throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); From 77c8f56953b2fa643c00e005dd02efa49dead429 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 01:49:42 +0300 Subject: [PATCH 0453/1219] Admin Panel: Entries Manager - cleanup and refactoring. --- site/plugins/admin/classes/EntriesManager.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index cf60be20..a27fc6e9 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -608,8 +608,11 @@ class EntriesManager array_replace_recursive($data, $default_data) )) { Notification::set('success', __('admin_message_entry_created')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } else { + Notification::set('success', __('admin_message_entry_was_not_created')); } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); } } else { throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); From 40b422cbe1d5e064d45a4e7b61adff788136f128 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 01:50:07 +0300 Subject: [PATCH 0454/1219] Admin Panel: Translates updates. --- site/plugins/admin/languages/en_US.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index 007c1c10..25be96e3 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -144,6 +144,7 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" From 9232d610b84a893551b44fb452547df8ef088ebd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:09 +0300 Subject: [PATCH 0455/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 6d8ce3e78a660c10110a08e0655ca29ae2a5d948 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:11 +0300 Subject: [PATCH 0456/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 8d5db9bb62194d58cdfac21dd9c034cc8e913eb1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:12 +0300 Subject: [PATCH 0457/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 4c7f9b5a..92034fd3 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 5e252ef8d3a06b06de94537ddce081bc9b2c0d8f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:14 +0300 Subject: [PATCH 0458/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 8e47487e..d3456bc9 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 8e1c3097f59db3ac381acd89e080186b48651317 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:16 +0300 Subject: [PATCH 0459/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 6e88501774c2bb46236d25d89e0f912625557f76 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:17 +0300 Subject: [PATCH 0460/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 3ce0fef2d9c56a299ffa326b98e2a9806e76318a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:19 +0300 Subject: [PATCH 0461/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 4873c1c4e46c1e4908e9c8efc6ddc15f1bea0f05 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:20 +0300 Subject: [PATCH 0462/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 33125fd2..b187811e 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Изменения успешно сохра admin_message_entry_changes_not_saved: "Изменения не сохранены" admin_message_entry_cloned: "Запись клонировалась" admin_message_entry_created: "Запись создана" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Запись удалена" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Файл успешно удален" admin_message_entry_file_uploaded: "Файл успешно загружен" From c444439b5cf6734022096f49b50373e74de359ec Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:21 +0300 Subject: [PATCH 0463/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From ae8fda42797dab8a369d54a4dadd016becf2d803 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:23 +0300 Subject: [PATCH 0464/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index adfe753a..36ad47d7 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From c48b7708ca731c252b7e3e2532ed8264b507464c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:24 +0300 Subject: [PATCH 0465/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 495724b89b56c3b435ddbadd6b12232a727d945e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:25 +0300 Subject: [PATCH 0466/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 404e85db..2c982280 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Zmiany zostały pomyślnie zapisane" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Wpis został skopiowany" admin_message_entry_created: "Utworzono wpis" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Wpis został usunięty" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Plik został pomyślnie usunięty" admin_message_entry_file_uploaded: "Plik został pomyślnie przesłany" From fcb63988201c08e00810c361484044c71f3276ad Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:26 +0300 Subject: [PATCH 0467/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From bc2adf0c849c2c63db7869ecf9b6747ae8f1bcff Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:28 +0300 Subject: [PATCH 0468/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From de006b7dea5ecd1e548b797bb20a7c26f7cbdff8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:29 +0300 Subject: [PATCH 0469/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 67476ac0..8d86d294 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From b1f98d06812d9c13a1531bf8c1f687d1363bfa9d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:31 +0300 Subject: [PATCH 0470/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 78c609bb..53030170 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From d8ee54fcee48f45a965c5f95fecd8d424b028350 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:33 +0300 Subject: [PATCH 0471/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 32609e8e2a064b97885ddb63b0a8d32c98f42443 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:34 +0300 Subject: [PATCH 0472/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From a8695730fe3ed8671c954c32c786f1e4d2238320 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:36 +0300 Subject: [PATCH 0473/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From f5d59ab19b85f7ee8fc5239013c1611dbd4592b7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:37 +0300 Subject: [PATCH 0474/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index e0ef2d3d..4969a9bd 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Änderungen erfolgreich gespeichert" admin_message_entry_changes_not_saved: "Änderungen nicht gespeichert" admin_message_entry_cloned: "Eintrag dupliziert" admin_message_entry_created: "Eintrag erstellt" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Eintrag gelöscht" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Datei erfolgreich gelöscht" admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen" From 8c53d9fabd7e960302a85769cacdd3c19ecb125f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:39 +0300 Subject: [PATCH 0475/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index 30a202e7..f40419ce 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 29c3af1a4fc68f52fa984b003b187ed26d1805f5 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:40 +0300 Subject: [PATCH 0476/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From b2fdefc9388bbc583f1865b3a4198d0f03ce32fc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:41 +0300 Subject: [PATCH 0477/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index a03dca19..10657aab 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 9f20579d0e4c425123a580330bc6d007782438cd Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:43 +0300 Subject: [PATCH 0478/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 9e66631360d318fca2f83b24108e44b3166ad298 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:45 +0300 Subject: [PATCH 0479/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 77cef3f1..24c55839 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Změny byly uloženy" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Stránka byla duplikována" admin_message_entry_created: "Stránka byla vytvořena" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Stránka byla odstraněna" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Soubor byl odstraněn" admin_message_entry_file_uploaded: "Soubor byl v pořádku nahrán" From 49fe138747320274238a26cbebdd144ca43a2f9a Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:46 +0300 Subject: [PATCH 0480/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 10081f70..e229841c 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Promjene su uspješno sačuvane" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Unos je kloniran" admin_message_entry_created: "Unos je stvoren" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Unos je obrisan" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "Fajl je uspješno obrisan" admin_message_entry_file_uploaded: "Fajl je uspješno uploadan" From c6eddc9f2d19efa670211d5077dbc8dcbf17a3cc Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:48 +0300 Subject: [PATCH 0481/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From da48778d84b8e735e001f2194f989a8e35d04632 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:49 +0300 Subject: [PATCH 0482/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 59434823e9305075ec11c1d7edea8a98c6d9dbe1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:51 +0300 Subject: [PATCH 0483/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From fd3e7ea432b85ad3dddcf6c84f38d42931dd9a1f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 18 Feb 2019 01:54:52 +0300 Subject: [PATCH 0484/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index 24deb81e..a464befb 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -145,7 +145,9 @@ admin_message_entry_changes_saved: "Changes successfully saved" admin_message_entry_changes_not_saved: "Changes not saved" admin_message_entry_cloned: "Entry cloned" admin_message_entry_created: "Entry created" +admin_message_entry_was_not_created: "Entry was not created" admin_message_entry_deleted: "Entry deleted" +admin_message_entry_was_not_renamed: "Entry was not renamed" admin_message_entry_was_not_deleted: "Entry was not deleted" admin_message_entry_file_deleted: "File successfully deleted" admin_message_entry_file_uploaded: "File successfully uploaded" From 59bd4ade9b6ace81da1e820d02b158278af56fbc Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 02:13:07 +0300 Subject: [PATCH 0485/1219] Flextype Core: Entries - delete() method - fixes. --- flextype/Entries.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index ca5fd8fe..0e80e7ad 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -208,9 +208,9 @@ class Entries * @param string $entry Entry * @return bool True on success, false on failure. */ - public static function delete(string $entry) : bool + public static function delete(string $entry) { - return Filesystem::delete(PATH['entries'] . '/' . $entry); + return Filesystem::deleteDir(PATH['entries'] . '/' . $entry); } /** From 5296bd0d115cb9a35be9a95ecf0e2115a7ccac13 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 02:14:46 +0300 Subject: [PATCH 0486/1219] - Flextype Core: Flextype Components Filesystem updated to 2.0.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c5ab7002..50622d75 100755 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "flextype-components/debug" : "1.0.0", "flextype-components/event" : "1.0.4", "flextype-components/errorhandler" : "1.0.5", - "flextype-components/filesystem" : "2.0.2", + "flextype-components/filesystem" : "2.0.3", "flextype-components/form" : "1.0.2", "flextype-components/i18n" : "1.2.0", "flextype-components/http" : "1.1.1", From e1a4e4bd6af92bd83beac360b28f916538611236 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 02:15:25 +0300 Subject: [PATCH 0487/1219] Admin Panel: Entries Manager - cleanup and refactoring. --- site/plugins/admin/classes/EntriesManager.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index a27fc6e9..92268f9e 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -551,7 +551,7 @@ class EntriesManager // Set new entry name $entry = $parent_entry . Text::safeString(Http::post('slug'), '-', true); - // Check if new entry directory exists + // Check if new entry exists if (!Entries::has($entry)) { // Get fieldset @@ -576,11 +576,11 @@ class EntriesManager $default_data['fieldset'] = Http::post('fieldset'); $default_data['date'] = date(Registry::get('settings.date_format'), time()); - // Define frontmatter values based on fieldset + // Predefine data values based on selected fieldset foreach ($fieldset['sections'] as $section) { foreach ($section as $key => $field) { - // Get values from default frontmatter + // Get values from default data if (isset($default_frontmatter[$key])) { $_value = $default_frontmatter[$key]; @@ -599,19 +599,16 @@ class EntriesManager } } - // Delete content field from frontmatter - Arr::delete($data, 'content'); + // Merge data + $data = array_replace_recursive($data, $default_data); - // Create a entry! - if (Entries::create( - $entry, - array_replace_recursive($data, $default_data) - )) { + // Create a new entry! + if (Entries::create($entry, $data)) { Notification::set('success', __('admin_message_entry_created')); } else { Notification::set('success', __('admin_message_entry_was_not_created')); } - + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); } } else { From c3c1ef1c21a97fb895ee8e397a20ec242fba9ca6 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 02:18:32 +0300 Subject: [PATCH 0488/1219] Flextype Core: Entries - delete() method - fixes. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 0e80e7ad..bb1ee725 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -208,7 +208,7 @@ class Entries * @param string $entry Entry * @return bool True on success, false on failure. */ - public static function delete(string $entry) + public static function delete(string $entry) : bool { return Filesystem::deleteDir(PATH['entries'] . '/' . $entry); } From 774443116d00142c759f3dd4ff9c9d56b2c2cd42 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 18 Feb 2019 02:29:43 +0300 Subject: [PATCH 0489/1219] Admin Panel: Entries Manager - cleanup and refactoring. --- site/plugins/admin/classes/EntriesManager.php | 31 +++++++++---------- .../views/templates/content/entries/add.php | 6 ++-- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 92268f9e..46667af5 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -20,7 +20,7 @@ use Intervention\Image\ImageManagerStatic as Image; class EntriesManager { - public static function getEntriesManager() + public static function getEntriesManager() : void { Registry::set('sidebar_menu_item', 'entries'); @@ -54,7 +54,7 @@ class EntriesManager } } - public static function getMediaList($entry, $path = false) + public static function getMediaList(string $entry, bool $path = false) : array { $files = []; @@ -73,7 +73,7 @@ class EntriesManager return $files; } - public static function displayEntryForm(array $fieldsets, array $values = []) + public static function displayEntryForm(array $fieldsets, array $values = []) : void { echo Form::open(null, ['id' => 'form']); echo Form::hidden('token', Token::generate()); @@ -197,7 +197,7 @@ class EntriesManager echo Form::close(); } - protected static function getEntriesQuery() + protected static function getEntriesQuery() : string { if (Http::get('entry') && Http::get('entry') != '') { $query = Http::get('entry'); @@ -208,14 +208,14 @@ class EntriesManager return $query; } - protected static function listEntry() + protected static function listEntry() : void { Themes::view('admin/views/templates/content/entries/list') ->assign('entries_list', Entries::fetchAll(EntriesManager::getEntriesQuery(), 'date', 'DESC')) ->display(); } - protected static function processFilesManager() + protected static function processFilesManager() : void { $files_directory = PATH['entries'] . '/' . Http::get('entry') . '/'; @@ -231,7 +231,6 @@ class EntriesManager if (Http::post('upload_file')) { if (Token::check(Http::post('token'))) { - //echo Registry::get('settings.entries.media.accept_file_types'); $file = EntriesManager::uploadFile($_FILES['file'], $files_directory, Registry::get('settings.entries.media.accept_file_types'), 27000000); @@ -280,7 +279,7 @@ class EntriesManager } } - protected static function editEntry() + protected static function editEntry() : void { $entry = Entries::fetch(Http::get('entry')); @@ -361,7 +360,7 @@ class EntriesManager } } - protected static function duplicateEntry() + protected static function duplicateEntry() : void { if (Http::get('entry') != '') { if (Token::check((Http::get('token')))) { @@ -379,7 +378,7 @@ class EntriesManager } } - protected static function moveEntry() + protected static function moveEntry() : void { $entry = Entries::fetch(Http::get('entry')); @@ -424,7 +423,7 @@ class EntriesManager ->display(); } - protected static function deleteEntry() + protected static function deleteEntry() : void { if (Http::get('entry') != '') { if (Token::check((Http::get('token')))) { @@ -442,7 +441,7 @@ class EntriesManager } } - protected static function renameEntry() + protected static function renameEntry() : void { $entry = Entries::fetch(Http::get('entry')); @@ -475,7 +474,7 @@ class EntriesManager ->display(); } - protected static function typeEntry() + protected static function typeEntry() : void { $type_entry = Http::post('type_entry'); @@ -534,7 +533,7 @@ class EntriesManager ->display(); } - protected static function addEntry() + protected static function addEntry() : void { $create_entry = Http::post('create_entry'); @@ -581,9 +580,9 @@ class EntriesManager foreach ($section as $key => $field) { // Get values from default data - if (isset($default_frontmatter[$key])) { + if (isset($default_data[$key])) { - $_value = $default_frontmatter[$key]; + $_value = $default_data[$key]; // Get values from fieldsets predefined field values } elseif (isset($field['value'])) { diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php index a6beccdd..c9340bcd 100644 --- a/site/plugins/admin/views/templates/content/entries/add.php +++ b/site/plugins/admin/views/templates/content/entries/add.php @@ -28,9 +28,9 @@ Themes::view('admin/views/partials/content-start')->display();
- - - + + +
'entryTitle']) ?> 'form-control', 'id' => 'entryTitle', 'required', 'data-validation' => 'length required', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> From c644f405d3a072af57b3b0fd8077c64ed6b36420 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 19 Feb 2019 23:33:35 +0300 Subject: [PATCH 0490/1219] Admin Panel: Information Manager - cleanup and refactoring. --- .../admin/classes/InformationManager.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/site/plugins/admin/classes/InformationManager.php b/site/plugins/admin/classes/InformationManager.php index 1e11f57d..77a1aca4 100644 --- a/site/plugins/admin/classes/InformationManager.php +++ b/site/plugins/admin/classes/InformationManager.php @@ -9,6 +9,29 @@ class InformationManager public static function getInformationManager() { Registry::set('sidebar_menu_item', 'infomation'); + Themes::view('admin/views/templates/system/information/list')->display(); } + + /** + * Tests whether a file is writable for anyone. + * + * @param string $file File to check + * @return bool + */ + public static function isFileWritable(string $file) : bool + { + // Is file exists ? + if (! file_exists($file)) { + throw new RuntimeException(vsprintf("%s(): The file '{$file}' doesn't exist", array(__METHOD__))); + } + + // Gets file permissions + $perms = fileperms($file); + + // Is writable ? + if (is_writable($file) || ($perms & 0x0080) || ($perms & 0x0010) || ($perms & 0x0002)) { + return true; + } + } } From da4573fc3525b6efb6722834e0f54ae7ca6c8f24 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 19 Feb 2019 23:33:48 +0300 Subject: [PATCH 0491/1219] Admin Panel: Information Manager - cleanup and refactoring. --- .../admin/views/templates/system/information/list.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/views/templates/system/information/list.php b/site/plugins/admin/views/templates/system/information/list.php index 89d7d9f9..d6a80a58 100644 --- a/site/plugins/admin/views/templates/system/information/list.php +++ b/site/plugins/admin/views/templates/system/information/list.php @@ -97,21 +97,20 @@ Themes::view('admin/views/partials/content-start')->display();

- -

- + - + From 8c5fd02d085239580c850f8e0dac391968d6dce6 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 13:49:29 +0300 Subject: [PATCH 0492/1219] Flextype Core: New Snippets API --- flextype/Snippets.php | 110 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 98 insertions(+), 12 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 9cbcb91d..69f1348b 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -19,52 +19,138 @@ class Snippets /** * Get snippet * - * Snippets::get('snippet-name'); + * Snippets::fetch('snippet-name'); * * @access public * @param string $snippet_name Snippet name * @return string|bool Returns the contents of the output buffer and end output buffering. * If output buffering isn't active then FALSE is returned. */ - public static function get(string $snippet_name) + public static function fetch(string $snippet) { $vars = []; - $vars['get'] = $snippet_name; + $vars['fetch'] = $snippet; - return Snippets::_snippet($vars); + return Snippets::_fetch_snippet($vars); } /** - * _snippet + * Rename snippet. * - * Snippets::get('snippet-name'); - * Snippets::get('snippetname', ['message' => 'Hello World']); + * @access public + * @param string $snippet Snippet + * @param string $new_snippet New snippet + * @return bool True on success, false on failure. + */ + public static function rename(string $snippet, string $new_snippet) : bool + { + return rename($snippet, $new_snippet); + } + + /** + * Update Snippet + * + * @access public + * @param string $snippet Snippet + * @param string $data Data + * @return bool True on success, false on failure. + */ + public static function update(string $snippet, string $data) : bool + { + $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + + if (Filesystem::has($snippet_file)) { + return Filesystem::write($snippet, $data); + } else { + return false; + } + } + + /** + * Create snippet + * + * @access public + * @param string $snippet Snippet + * @param string $data Data + * @return bool True on success, false on failure. + */ + public static function create(string $snippet, string $data) : bool + { + $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + + // Check if new entry file exists + if (!Filesystem::has($snippet_file)) { + return Filesystem::write($snippet_file, $data); + } else { + return false; + } + } + + /** + * Delete snippet. + * + * @access public + * @param string $snippet Snippet + * @return bool True on success, false on failure. + */ + public static function delete(string $snippet) : bool + { + return Filesystem::delete(PATH['snippets'] . '/' . $entry . '.php'); + } + + /** + * Copy snippet + * + * @access public + * @param string $snippet Snippet + * @param string $new_snippet New snippet + * @return bool True on success, false on failure. + */ + public static function copy(string $snippet, string $new_snippet) : bool + { + return Filesystem::copy($snippet, $new_snippet, false); + } + + /** + * Check whether snippet exists. + * + * @access public + * @param string $snippet Snippet + * @return bool True on success, false on failure. + */ + public static function has(string $snippet) : bool + { + return Filesystem::has(PATH['snippets'] . '/' . $snippet . '.php'); + } + + /** + * Helper private method _fetch_snippet * * @access private * @param array $vars Vars * @return string|bool Returns the contents of the output buffer and end output buffering. * If output buffering isn't active then FALSE is returned. */ - private static function _snippet(array $vars) { + private static function _fetch_snippet(array $vars) { // Extracst attributes extract($vars); // Get snippet name - $name = (isset($get)) ? (string) $get : ''; + $name = (isset($fetch)) ? (string) $fetch : ''; // Define snippet path - $snippet_path = PATH['snippets'] . '/' . $name . '.php'; + $snippet_file = PATH['snippets'] . '/' . $name . '.php'; // Process snippet - if (Filesystem::has($snippet_path)) { + if (Filesystem::has($snippet_file)) { // Turn on output buffering ob_start(); // Include view file - include $snippet_path; + include $snippet_file; // Output... return ob_get_clean(); From 54ce0541cf377944a2c96ce91a870cd08aba8ed7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 13:53:03 +0300 Subject: [PATCH 0493/1219] Flextype Core: Shortcodes - start using new Snippets API --- flextype/shortcodes/SnippetsShortcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/shortcodes/SnippetsShortcode.php b/flextype/shortcodes/SnippetsShortcode.php index 20f440b2..e0c030fd 100644 --- a/flextype/shortcodes/SnippetsShortcode.php +++ b/flextype/shortcodes/SnippetsShortcode.php @@ -16,7 +16,7 @@ use Thunder\Shortcode\ShortcodeFacade; use Thunder\Shortcode\Shortcode\ShortcodeInterface; // Snippets -// Shortcode: [snippets get=snippet-name] +// Shortcode: [snippets fetch=snippet-name] Shortcodes::shortcode()->addHandler('snippets', function(ShortcodeInterface $s) { - return Snippets::get($s->getParameter('get')); + return Snippets::get($s->getParameter('fetch')); }); From e19c396b6590abffcaef59018495e2a116315f38 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 13:58:16 +0300 Subject: [PATCH 0494/1219] Flextype Core: Entries - code cleanup and refactoring --- flextype/Entries.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/flextype/Entries.php b/flextype/Entries.php index bb1ee725..307c4a1f 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -22,6 +22,7 @@ class Entries /** * Fetch entry * + * @access public * @param string $entry Entry * @return array|false The entry contents or false on failure. */ @@ -76,6 +77,7 @@ class Entries /** * Fetch entries * + * @access public * @param string $entry Entry * @param string $order_by Order by specific entry field. * @param string $order_type Order type: DESC or ASC @@ -142,6 +144,7 @@ class Entries /** * Rename entry. * + * @access public * @param string $entry Entry * @param string $new_entry New entry * @return bool True on success, false on failure. @@ -154,6 +157,7 @@ class Entries /** * Update entry * + * @access public * @param string $entry Entry * @param array $data Data * @return bool @@ -172,6 +176,7 @@ class Entries /** * Create entry * + * @access public * @param string $entry Entry * @param array $data Data * @return bool @@ -205,6 +210,7 @@ class Entries /** * Delete entry. * + * @access public * @param string $entry Entry * @return bool True on success, false on failure. */ @@ -216,6 +222,7 @@ class Entries /** * Copy entry(s) * + * @access public * @param string $entry Entry * @param string $new_entry New entry * @param bool $recursive Recursive copy entries. @@ -229,6 +236,7 @@ class Entries /** * Check whether entry exists. * + * @access public * @param string $entry Entry * @return bool */ From b5f20aac3fe87f31072cd62a694627185024d5aa Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 14:08:27 +0300 Subject: [PATCH 0495/1219] Flextype: Copyrights information updates. --- .htaccess | 6 +++--- flextype/Cache.php | 4 ++-- flextype/Entries.php | 4 ++-- flextype/Flextype.php | 14 ++++++++++++-- flextype/Images.php | 4 ++-- flextype/Plugins.php | 4 ++-- flextype/Shortcodes.php | 4 ++-- flextype/Site.php | 4 ++-- flextype/Snippets.php | 4 ++-- flextype/Themes.php | 4 ++-- flextype/parsers/YamlParser.php | 4 ++-- flextype/shortcodes/ImagesShortcode.php | 4 ++-- flextype/shortcodes/ImagesUrlShortcode.php | 4 ++-- flextype/shortcodes/SiteUrlShortcode.php | 4 ++-- flextype/shortcodes/SnippetsShortcode.php | 4 ++-- index.php | 4 ++-- site/plugins/admin/admin.php | 4 ++-- 17 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.htaccess b/.htaccess index 79ca61d4..d94ee926 100755 --- a/.htaccess +++ b/.htaccess @@ -1,8 +1,8 @@ ## # @package Flextype # -# @author Sergey Romanenko -# @link http://flextype.org +# @author Sergey Romanenko +# @link http://romanenko.digital # # For the full copyright and license information, please view the LICENSE # file that was distributed with this source code. @@ -21,7 +21,7 @@ RewriteEngine On -RewriteBase / +RewriteBase /flextype/ ## Begin - Exploits # If you experience problems on your site block out the operations listed below diff --git a/flextype/Cache.php b/flextype/Cache.php index afd9720a..65934fcd 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Entries.php b/flextype/Entries.php index 307c4a1f..be35ef98 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 7a878fdd..09650b99 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Romanenko Sergey / Awilum - * @link http://flextype.org + * @author Romanenko Sergey + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -105,9 +105,19 @@ class Flextype // Get Plugins Instance Plugins::getInstance(); + // echo '
';
+    //    print_r(Entries::fetchAll('test', 'slug', 'DESC'));
+    //    echo '
'; + + // die(); + // Get Site Instance Site::getInstance(); + //var_dump(\Symfony\Component\Yaml\Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK); + + //Entries::create('test', ['title' => 'Title', 'content' => "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis \nnostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."]); + // Flush (send) the output buffer and turn off output buffering ob_end_flush(); } diff --git a/flextype/Images.php b/flextype/Images.php index e7bbf080..2375c384 100644 --- a/flextype/Images.php +++ b/flextype/Images.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Plugins.php b/flextype/Plugins.php index ff6c2a44..41b28e3e 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 49319b71..0631dd30 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Site.php b/flextype/Site.php index 85e8fe28..95f1e0b2 100644 --- a/flextype/Site.php +++ b/flextype/Site.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 69f1348b..f56fb888 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/Themes.php b/flextype/Themes.php index 86aa57db..56cc4b74 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/parsers/YamlParser.php b/flextype/parsers/YamlParser.php index 6a49a518..c49dd1b7 100644 --- a/flextype/parsers/YamlParser.php +++ b/flextype/parsers/YamlParser.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/shortcodes/ImagesShortcode.php b/flextype/shortcodes/ImagesShortcode.php index 041372a7..e73b7f2e 100644 --- a/flextype/shortcodes/ImagesShortcode.php +++ b/flextype/shortcodes/ImagesShortcode.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/shortcodes/ImagesUrlShortcode.php b/flextype/shortcodes/ImagesUrlShortcode.php index f22fc54d..13cc07c4 100644 --- a/flextype/shortcodes/ImagesUrlShortcode.php +++ b/flextype/shortcodes/ImagesUrlShortcode.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/shortcodes/SiteUrlShortcode.php b/flextype/shortcodes/SiteUrlShortcode.php index bc143c99..c4e668ea 100644 --- a/flextype/shortcodes/SiteUrlShortcode.php +++ b/flextype/shortcodes/SiteUrlShortcode.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/flextype/shortcodes/SnippetsShortcode.php b/flextype/shortcodes/SnippetsShortcode.php index e0c030fd..ee139fa9 100644 --- a/flextype/shortcodes/SnippetsShortcode.php +++ b/flextype/shortcodes/SnippetsShortcode.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/index.php b/index.php index 60d87c5b..746f90da 100755 --- a/index.php +++ b/index.php @@ -3,8 +3,8 @@ /** * @package Flextype * - * @author Sergey Romanenko - * @link http://flextype.org + * @author Sergey Romanenko + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php index ca292f2e..7ff3dfdf 100755 --- a/site/plugins/admin/admin.php +++ b/site/plugins/admin/admin.php @@ -6,8 +6,8 @@ namespace Flextype; * * Flextype Admin Plugin * - * @author Romanenko Sergey / Awilum - * @link http://flextype.org + * @author Romanenko Sergey / Awilum + * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. From 6c6342c77dcea787cfca6945479561da8f7a2e19 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 14:19:35 +0300 Subject: [PATCH 0496/1219] Flextype Core: New Images API --- flextype/Images.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flextype/Images.php b/flextype/Images.php index 2375c384..66eec8ed 100644 --- a/flextype/Images.php +++ b/flextype/Images.php @@ -18,7 +18,7 @@ use Flextype\Component\Html\Html; class Images { /** - * An instance of the Themes class + * An instance of the Images class * * @var object */ @@ -119,9 +119,9 @@ class Images } /** - * Get image url + * Fetch image url * - * Images::getImageUrl('page-name/image.jpg', [w => '200']); + * Images::fetchImageUrl('page-name/image.jpg', [w => '200']); * http://glide.thephpleague.com/1.0/api/quick-reference/ * * @access public @@ -129,7 +129,7 @@ class Images * @param array $params Image params * @return string */ - public static function getImageUrl(string $path, array $params) : string + public static function fetchImageUrl(string $path, array $params) : string { if (file_exists(PATH['entries'] . '/' . $path)) { return Http::getBaseUrl() . '/site/cache/glide/' . Images::$server->makeImage($path, $params); @@ -139,9 +139,9 @@ class Images } /** - * Get image + * Fetch image * - * Images::getImage('page-name/image.jpg', [w => '200']); + * Images::fetchImage('page-name/image.jpg', [w => '200']); * http://glide.thephpleague.com/1.0/api/quick-reference/ * * @access public @@ -150,7 +150,7 @@ class Images * @param array $attributes Image html attributes * @return string */ - public static function getImage(string $path, array $params, array $attributes = []) : string + public static function fetchImage(string $path, array $params, array $attributes = []) : string { if (file_exists(PATH['entries'] . '/' . $path)) { return ''; From 2af3bafd04f2c59c63ad94ff5f9b1f2347302717 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 14:20:53 +0300 Subject: [PATCH 0497/1219] Flextype Core: Shortcodes - start using new Images API --- flextype/shortcodes/ImagesShortcode.php | 2 +- flextype/shortcodes/ImagesUrlShortcode.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flextype/shortcodes/ImagesShortcode.php b/flextype/shortcodes/ImagesShortcode.php index e73b7f2e..5e583590 100644 --- a/flextype/shortcodes/ImagesShortcode.php +++ b/flextype/shortcodes/ImagesShortcode.php @@ -57,5 +57,5 @@ Shortcodes::shortcode()->addHandler('images', function(ShortcodeInterface $s) { ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); - return Images::getImage($s->getParameter('path'), $params, $attributes); + return Images::fetchImage($s->getParameter('path'), $params, $attributes); }); diff --git a/flextype/shortcodes/ImagesUrlShortcode.php b/flextype/shortcodes/ImagesUrlShortcode.php index 13cc07c4..f7c734d8 100644 --- a/flextype/shortcodes/ImagesUrlShortcode.php +++ b/flextype/shortcodes/ImagesUrlShortcode.php @@ -50,5 +50,5 @@ Shortcodes::shortcode()->addHandler('images_url', function(ShortcodeInterface $s ($s->getParameter('q')) and $params['q'] = $s->getParameter('q'); ($s->getParameter('fm')) and $params['fm'] = $s->getParameter('fm'); - return Images::getImageUrl($s->getParameter('path'), $params); + return Images::fetchImageUrl($s->getParameter('path'), $params); }); From 8a72f700f58fb24946632828538b22ed19ba7498 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 14:29:51 +0300 Subject: [PATCH 0498/1219] Flextype Core: Snippets API - improvements --- flextype/Snippets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index f56fb888..9163406f 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -75,7 +75,7 @@ class Snippets * @param string $data Data * @return bool True on success, false on failure. */ - public static function create(string $snippet, string $data) : bool + public static function create(string $snippet, string $data = '') : bool { $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; From de8a9710c0ce36f8cd83d98de304f8510115aeed Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 15:58:54 +0300 Subject: [PATCH 0499/1219] Admin Panel: Translates updates. --- site/plugins/admin/languages/en_US.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index 25be96e3..e10e75c9 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -121,6 +121,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -129,6 +133,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From fabad8c7c1d5a57de55247e38a5b40c741e83b64 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 15:59:22 +0300 Subject: [PATCH 0500/1219] Admin Panel: Snippets Manager - code cleanup and refactoring. --- .../plugins/admin/classes/SnippetsManager.php | 239 +++++++++++------- 1 file changed, 142 insertions(+), 97 deletions(-) diff --git a/site/plugins/admin/classes/SnippetsManager.php b/site/plugins/admin/classes/SnippetsManager.php index 9dc1c1ce..422746ee 100644 --- a/site/plugins/admin/classes/SnippetsManager.php +++ b/site/plugins/admin/classes/SnippetsManager.php @@ -16,118 +16,163 @@ class SnippetsManager { Registry::set('sidebar_menu_item', 'snippets'); - // Create directory for logs + // Create directory for snippets !Filesystem::has(PATH['snippets']) and Filesystem::createDir(PATH['snippets']); switch (Http::getUriSegment(2)) { case 'add': - $create_snippet = Http::post('create_snippet'); - - if (isset($create_snippet)) { - if (Token::check((Http::post('token')))) { - - $file = PATH['snippets'] . '/' . Text::safeString(Http::post('name'), '-', true) . '.php'; - - if (!Filesystem::has($file)) { - // Create a snippet! - if (Filesystem::write( - $file, - "" - )) { - Notification::set('success', __('admin_message_snippet_created')); - Http::redirect(Http::getBaseUrl() . '/admin/snippets'); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/snippets/add') - ->display(); + SnippetsManager::addSnippet(); break; case 'delete': - if (Http::get('snippet') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::delete(PATH['snippets'] . '/' . Http::get('snippet') . '.php'); - Notification::set('success', __('admin_message_snippet_deleted')); - Http::redirect(Http::getBaseUrl() . '/admin/snippets'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + SnippetsManager::deleteSnippet(); break; case 'rename': - $rename_snippet = Http::post('rename_snippet'); - - if (isset($rename_snippet)) { - if (Token::check((Http::post('token')))) { - if (!Filesystem::has(PATH['snippets'] . '/' . Http::post('name') . '.php')) { - if (rename( - PATH['snippets'] . '/' . Http::post('name_current') . '.php', - PATH['snippets'] . '/' . Http::post('name') . '.php') - ) { - Notification::set('success', __('admin_message_snippet_renamed')); - Http::redirect(Http::getBaseUrl() . '/admin/snippets'); - } - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/snippets/rename') - ->assign('name_current', Http::get('snippet')) - ->display(); + SnippetsManager::renameSnippet(); break; case 'duplicate': - if (Http::get('snippet') != '') { - if (Token::check((Http::get('token')))) { - Filesystem::copy(PATH['snippets'] . '/' . Http::get('snippet') . '.php', - PATH['snippets'] . '/' . Http::get('snippet') . '-duplicate-' . date("Ymd_His") . '.php'); - Notification::set('success', __('admin_message_snippet_duplicated')); - Http::redirect(Http::getBaseUrl() . '/admin/snippets'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + SnippetsManager::duplicateSnippet(); break; case 'edit': - $action = Http::post('action'); - - if (isset($action) && $action == 'save-form') { - if (Token::check((Http::post('token')))) { - - // Save a snippet! - if (Filesystem::write( - PATH['snippets'] . '/' . Http::post('name') . '.php', - Http::post('snippet') - )) { - Notification::set('success', __('admin_message_snippet_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/snippets/edit?snippet=' . Http::post('name')); - } - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } - - Themes::view('admin/views/templates/extends/snippets/edit') - ->assign('snippet', Filesystem::read(PATH['snippets'] . '/' . Http::get('snippet') . '.php')) - ->display(); + SnippetsManager::editSnippet(); break; default: - $snippets = []; - - foreach (Filesystem::listContents(PATH['snippets']) as $snippet) { - if ($snippet['type'] == 'file' && $snippet['extension'] == 'php') { - $snippets[$snippet['basename']] = $snippet['basename']; - } - } - - Themes::view('admin/views/templates/extends/snippets/list') - ->assign('snippets_list', $snippets) - ->display(); + SnippetsManager::listSnippet(); break; } } + + private static function editSnippet() + { + $action = Http::post('action'); + + if (isset($action) && $action == 'save-form') { + if (Token::check((Http::post('token')))) { + + // Save a snippet! + if (Snippets::update( + Http::post('name'), + Http::post('snippet') + )) { + Notification::set('success', __('admin_message_snippet_saved')); + } else { + Notification::set('error', __('admin_message_snippet_was_not_saved')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/snippets/edit?snippet=' . Http::post('name')); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/extends/snippets/edit') + ->assign('snippet', Filesystem::read(PATH['snippets'] . '/' . Http::get('snippet') . '.php')) + ->display(); + } + + private static function listSnippet() + { + $snippets = []; + + foreach (Filesystem::listContents(PATH['snippets']) as $snippet) { + if ($snippet['type'] == 'file' && $snippet['extension'] == 'php') { + $snippets[$snippet['basename']] = $snippet['basename']; + } + } + + Themes::view('admin/views/templates/extends/snippets/list') + ->assign('snippets_list', $snippets) + ->display(); + } + + private static function duplicateSnippet() + { + if (Http::get('snippet') != '') { + if (Token::check((Http::get('token')))) { + if (Snippets::copy(Http::get('snippet'), + Http::get('snippet') . '-duplicate-' . date("Ymd_His"))) { + Notification::set('success', __('admin_message_snippet_duplicated')); + } else { + Notification::set('error', __('admin_message_snippet_was_not_duplicated')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/snippets'); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + + private static function renameSnippet() + { + $rename_snippet = Http::post('rename_snippet'); + + if (isset($rename_snippet)) { + if (Token::check((Http::post('token')))) { + if (!Snippets::has(Http::post('name'))) { + if (Snippets::rename( + Http::post('name_current'), + Http::post('name')) + ) { + Notification::set('success', __('admin_message_snippet_renamed')); + } else { + Notification::set('error', __('admin_message_snippet_was_not_renamed')); + } + Http::redirect(Http::getBaseUrl() . '/admin/snippets'); + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/extends/snippets/rename') + ->assign('name_current', Http::get('snippet')) + ->display(); + } + + private static function deleteSnippet() + { + if (Http::get('snippet') != '') { + if (Token::check((Http::get('token')))) { + + if (Snippets::delete(Http::get('snippet'))) { + Notification::set('success', __('admin_message_snippet_deleted')); + } else { + Notification::set('error', __('admin_message_snippet_was_not_deleted')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/snippets'); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + + private static function addSnippet() + { + $create_snippet = Http::post('create_snippet'); + + if (isset($create_snippet)) { + if (Token::check((Http::post('token')))) { + + $snippet_name = Text::safeString(Http::post('name'), '-', true); + + if (!Snippets::has($snippet_name)) { + + // Create a snippet! + if (Snippets::create($snippet_name)) { + Notification::set('success', __('admin_message_snippet_created')); + } else { + Notification::set('error', __('admin_message_snippet_was_not_created')); + } + + Http::redirect(Http::getBaseUrl() . '/admin/snippets'); + } + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + + Themes::view('admin/views/templates/extends/snippets/add') + ->display(); + } } From 0f91e5cd4a9703be290242c57a78936b5dd620ed Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:31 +0300 Subject: [PATCH 0501/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 2234e332f6b6f0639af3dab9ff18b01678d6c504 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:33 +0300 Subject: [PATCH 0502/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 0bdd2a29c323cb567fd35000f9a57cb9d562f54c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:37 +0300 Subject: [PATCH 0503/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index 92034fd3..bc8e6271 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -122,6 +122,10 @@ admin_type: "Тип" admin_partial: "Частково" admin_clone: "Клонувати" admin_create_new_snippet: "Створити новий сніпет тут" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Створити новий шаблон" admin_message_template_created: "Шаблон створений" admin_message_template_deleted: "Шаблон видалено" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Шаблон дублюється" admin_message_template_saved: "Шаблон збережено" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 60f82fe439857a073a9a1dad2e29ce8be587bbad Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:39 +0300 Subject: [PATCH 0504/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index d3456bc9..645a17ae 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -122,6 +122,10 @@ admin_type: "Tür" admin_partial: "Partial" admin_clone: "Klonla" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Şablon silindi" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 2182452494c206a1f461207a1e715344d7b1c9d7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:41 +0300 Subject: [PATCH 0505/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 15d46c9edf95334e215f16cf24add8d00210d954 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:42 +0300 Subject: [PATCH 0506/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From b15b4b59558e0cc14902e07e2d7cfe1f262292e7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:44 +0300 Subject: [PATCH 0507/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 79c24b3926334e7de8a071c824d276bf6499474d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:46 +0300 Subject: [PATCH 0508/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index b187811e..6ddf0923 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -122,6 +122,10 @@ admin_type: "Тип" admin_partial: "Партиал" admin_clone: "Клон" admin_create_new_snippet: "Создать новый сниппет" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Создать новый шаблон" admin_message_template_created: "Шаблон создан" admin_message_template_deleted: "Шаблон удален" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Шаблон дублировался" admin_message_template_saved: "Шаблон сохранен" admin_message_snippet_saved: "Сниппет сохранен" admin_message_snippet_created: "Сниппет создан" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Сниппет удален" admin_message_snippet_renamed: "Сниппет переименован" admin_message_snippet_duplicated: "Сниппет дублирован " From 5b255c90cc7536ddde3660e89f947fd6db2a2b5f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:47 +0300 Subject: [PATCH 0509/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 1c3c70373a28e20b0e0edc8de8697b7c1d066b8c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:49 +0300 Subject: [PATCH 0510/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 36ad47d7..284e0d4b 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 5d99c98f29227c2ae59e023f15c106bc6d9d7252 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:51 +0300 Subject: [PATCH 0511/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 304f23dd88cac2c6eece0d9dc3d919989e2673d8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:52 +0300 Subject: [PATCH 0512/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 2c982280..1b1b544d 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -122,6 +122,10 @@ admin_type: "Rodzaj" admin_partial: "Częściowy" admin_clone: "Kopiuj" admin_create_new_snippet: "Utwórz nowy fragment kodu" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Utwórz nowy szablon" admin_message_template_created: "Szablon utworzony" admin_message_template_deleted: "Szablon został usunięty" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Szablon został skopiowany" admin_message_template_saved: "Szablon został zapisany" admin_message_snippet_saved: "fragment kodu został zapisany" admin_message_snippet_created: "Utworzono fragment kodu" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Fragment kodu usunięty" admin_message_snippet_renamed: "Zmieniono nazwę fragmentu kodu" admin_message_snippet_duplicated: "Fragment kodu został skopiowany" From dffaa0b07a3c8abdd289f2316d6025ec75664ab1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:54 +0300 Subject: [PATCH 0513/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 64bb7326d664dfc904c4f1a98488d7496ffb196f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:55 +0300 Subject: [PATCH 0514/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 6596b29ebfb5298b86c0a5226d9b7cc32f5303f2 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:57 +0300 Subject: [PATCH 0515/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 8d86d294..82490b86 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -122,6 +122,10 @@ admin_type: "Tipo" admin_partial: "Parziale" admin_clone: "Clona" admin_create_new_snippet: "Crea nuovo snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Crea nuovo template" admin_message_template_created: "Template creato" admin_message_template_deleted: "Template eliminato" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicato" admin_message_template_saved: "Template salvato" admin_message_snippet_saved: "Snippet salvato" admin_message_snippet_created: "Snippet creato" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet eliminato" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 35c5ab5160a680ea7655caa243ddc84ebbc6ef5c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:01:58 +0300 Subject: [PATCH 0516/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index 53030170..af35c6bb 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 1d6b9996683cf30eda247a3404a01b3721a517d4 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:00 +0300 Subject: [PATCH 0517/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From c23106c2a0366ccaf105c1549d8e14db1a2bb30c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:01 +0300 Subject: [PATCH 0518/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 978cb97d068bea8a40d5f3c7581337fa882a5e09 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:03 +0300 Subject: [PATCH 0519/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From de63818f06e4c733cdb3944f1526f8b26b0938aa Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:05 +0300 Subject: [PATCH 0520/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 4969a9bd..12661490 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -122,6 +122,10 @@ admin_type: "Typ" admin_partial: "Partial" admin_clone: "Duplizieren" admin_create_new_snippet: "Neuen Schnipsel erstellen" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Neue Vorlage erstellen" admin_message_template_created: "Vorlage erstellt" admin_message_template_deleted: "Vorlage gelöscht" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Vorlage dupliziert" admin_message_template_saved: "Vorlage gespeichert" admin_message_snippet_saved: "Schnipsel gespeichert" admin_message_snippet_created: "Schnipsel erstellt" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Schnipsel gelöscht" admin_message_snippet_renamed: "Schnipsel umbenannt" admin_message_snippet_duplicated: "Schnipsel dupliziert" From e38cb04447b513e85caf20dcf976e073907325a7 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:08 +0300 Subject: [PATCH 0521/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index f40419ce..ae98ae93 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 27a1ef0b954fca11633d583b62dc236b0d1fe0ff Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:09 +0300 Subject: [PATCH 0522/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 2b568442d9f034bfa68462648a03d75327b5b952 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:11 +0300 Subject: [PATCH 0523/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index 10657aab..faf7b1a9 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 953f1b9070a24804fe24d68073aa73a3b3f0b1da Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:13 +0300 Subject: [PATCH 0524/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 92e6b12657d7118f3e035713150a3ae79462a21d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:15 +0300 Subject: [PATCH 0525/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index 24c55839..b1663400 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -122,6 +122,10 @@ admin_type: "Typ" admin_partial: "Partial" admin_clone: "Duplikovat" admin_create_new_snippet: "Vytvořit nový výstřižek kódu" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Vytvořit novou šablonu" admin_message_template_created: "Šablona byla vytvořena" admin_message_template_deleted: "Šablona byla odstraněna" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Šablona byla duplikována" admin_message_template_saved: "Šablona byla uložena" admin_message_snippet_saved: "Výstřižek kódu uložen" admin_message_snippet_created: "Výstřižek kódu vytvořen" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Výstřižek kódu odstraněn" admin_message_snippet_renamed: "Výstřižek kódu přejmenován" admin_message_snippet_duplicated: "Výstřižek kódu duplikován" From b25fc71ff055682da25a19129b8a091e17992eba Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:17 +0300 Subject: [PATCH 0526/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index e229841c..1605a579 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -122,6 +122,10 @@ admin_type: "Tip" admin_partial: "Partial" admin_clone: "Kloniraj" admin_create_new_snippet: "Stvori novu svašticu" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Stvori novi predložak" admin_message_template_created: "Predložak je stvoren" admin_message_template_deleted: "Predložak je obrisan" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Predložak je dupliciran" admin_message_template_saved: "Predložak je sačuvan" admin_message_snippet_saved: "Svaštica je sačuvana" admin_message_snippet_created: "Svaštica je stvorena" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Svaštica je obrisana" admin_message_snippet_renamed: "Svaštica je preimenovana" admin_message_snippet_duplicated: "Svaštica je duplicirana" From f1dba52edf488f70eee4a4409f0a114ab1706770 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:18 +0300 Subject: [PATCH 0527/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 39c9c984db48a6f6d4d0ec0602ab924c46ac3e8d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:20 +0300 Subject: [PATCH 0528/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 99308f8b9bac1c06d4524b6f194170df20e8a9c8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:21 +0300 Subject: [PATCH 0529/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From c946005311cfcd565a9a6226570f965f96217267 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 16:02:22 +0300 Subject: [PATCH 0530/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index a464befb..f2cda261 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -122,6 +122,10 @@ admin_type: "Type" admin_partial: "Partial" admin_clone: "Clone" admin_create_new_snippet: "Create New Snippet" +admin_message_snippet_was_not_deleted: "Snippet was not deleted" +admin_message_snippet_was_not_renamed: "Snippet was not renamed" +admin_message_snippet_was_not_duplicated: "Snippet was not duplicated" +admin_message_snippet_was_not_saved: "Snippet was not saved" admin_create_new_template: "Create New Template" admin_message_template_created: "Template created" admin_message_template_deleted: "Template deleted" @@ -130,6 +134,7 @@ admin_message_template_duplicated: "Template duplicated" admin_message_template_saved: "Template saved" admin_message_snippet_saved: "Snippet saved" admin_message_snippet_created: "Snippet created" +admin_message_snippet_was_not_created: "Snippet was not created" admin_message_snippet_deleted: "Snippet deleted" admin_message_snippet_renamed: "Snippet renamed" admin_message_snippet_duplicated: "Snippet duplicated" From 4d536f61881047e3acead8566c910ad92b26837e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 16:22:34 +0300 Subject: [PATCH 0531/1219] Flextype Core: Flextype - fixes --- flextype/Flextype.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 09650b99..39bfff7f 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -105,19 +105,9 @@ class Flextype // Get Plugins Instance Plugins::getInstance(); - // echo '
';
-    //    print_r(Entries::fetchAll('test', 'slug', 'DESC'));
-    //    echo '
'; - - // die(); - // Get Site Instance Site::getInstance(); - //var_dump(\Symfony\Component\Yaml\Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK); - - //Entries::create('test', ['title' => 'Title', 'content' => "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis \nnostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."]); - // Flush (send) the output buffer and turn off output buffering ob_end_flush(); } From 6d911e5bf27a288b0c899e8aa41f2e4148f9cfc4 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 16:22:46 +0300 Subject: [PATCH 0532/1219] Flextype Core: Snippets API - improvements and fixes --- flextype/Snippets.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 9163406f..cb1510de 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -45,7 +45,10 @@ class Snippets */ public static function rename(string $snippet, string $new_snippet) : bool { - return rename($snippet, $new_snippet); + $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + $new_snippet_file = PATH['snippets'] . '/' . $new_snippet . '.php'; + + return rename($snippet_file, $new_snippet_file); } /** @@ -61,7 +64,7 @@ class Snippets $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; if (Filesystem::has($snippet_file)) { - return Filesystem::write($snippet, $data); + return Filesystem::write($snippet_file, $data); } else { return false; } @@ -96,7 +99,9 @@ class Snippets */ public static function delete(string $snippet) : bool { - return Filesystem::delete(PATH['snippets'] . '/' . $entry . '.php'); + $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + + return Filesystem::delete($snippet_file); } /** @@ -109,7 +114,10 @@ class Snippets */ public static function copy(string $snippet, string $new_snippet) : bool { - return Filesystem::copy($snippet, $new_snippet, false); + $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + $new_snippet_file = PATH['snippets'] . '/' . $new_snippet . '.php'; + + return Filesystem::copy($snippet_file, $new_snippet_file, false); } /** @@ -121,7 +129,9 @@ class Snippets */ public static function has(string $snippet) : bool { - return Filesystem::has(PATH['snippets'] . '/' . $snippet . '.php'); + $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + + return Filesystem::has($snippet_file); } /** From e2180d5c32afa347c291ecd5b4f71d5e7ffd6ff0 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 16:28:11 +0300 Subject: [PATCH 0533/1219] Flextype Core: Entries API - improvements and fixes --- flextype/Entries.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index be35ef98..387361db 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -30,7 +30,6 @@ class Entries { $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; - if (Filesystem::has($entry_file)) { $cache_id = md5('entry' . $entry_file . ((Filesystem::getTimestamp($entry_file) === false) ? '' : Filesystem::getTimestamp($entry_file))); @@ -151,7 +150,10 @@ class Entries */ public static function rename(string $entry, string $new_entry) : bool { - return rename($entry, $new_entry); + $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + $new_entry_file = PATH['entries'] . '/' . $new_entry . '/entry.yaml'; + + return rename($entry_file, $new_entry_file); } /** @@ -216,7 +218,9 @@ class Entries */ public static function delete(string $entry) : bool { - return Filesystem::deleteDir(PATH['entries'] . '/' . $entry); + $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + + return Filesystem::deleteDir($entry_file); } /** @@ -230,7 +234,10 @@ class Entries */ public static function copy(string $entry, string $new_entry, bool $recursive = false) : bool { - return Filesystem::copy($entry, $new_entry, $recursive); + $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + $new_entry_file = PATH['entries'] . '/' . $new_entry . '/entry.yaml'; + + return Filesystem::copy($entry_file, $new_entry_file, $recursive); } /** @@ -242,6 +249,8 @@ class Entries */ public static function has(string $entry) : bool { - return Filesystem::has(PATH['entries'] . '/' . $entry . '/entry.yaml'); + $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + + return Filesystem::has($entry_file); } } From 3e5bc7622bf462a95b4a4db1b45c304fb5a4add0 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 16:41:46 +0300 Subject: [PATCH 0534/1219] Flextype Core: Entries API - improvements and fixes --- flextype/Entries.php | 48 ++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index 387361db..a51da1ce 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -28,7 +28,7 @@ class Entries */ public static function fetch(string $entry) { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + $entry_file = Entries::_file_location($entry); if (Filesystem::has($entry_file)) { @@ -93,7 +93,7 @@ class Entries $cache_id = ''; // Entries path - $entries_path = PATH['entries'] . '/' . $entry; + $entries_path = Entries::_dir_location($entry); // Get entries list $entries_list = Filesystem::listContents($entries_path); @@ -150,10 +150,7 @@ class Entries */ public static function rename(string $entry, string $new_entry) : bool { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; - $new_entry_file = PATH['entries'] . '/' . $new_entry . '/entry.yaml'; - - return rename($entry_file, $new_entry_file); + return rename(Entries::_dir_location($entry), Entries::_dir_location($new_entry)); } /** @@ -166,7 +163,7 @@ class Entries */ public static function update(string $entry, array $data) : bool { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + $entry_file = Entries::_file_location($entry); if (Filesystem::has($entry_file)) { return Filesystem::write($entry_file, YamlParser::encode($data)); @@ -185,7 +182,7 @@ class Entries */ public static function create(string $entry, array $data) : bool { - $entry_dir = PATH['entries'] . '/' . $entry; + $entry_dir = Entries::_dir_location($entry); // Check if new entry directory exists if (!Filesystem::has($entry_dir)) { @@ -218,9 +215,7 @@ class Entries */ public static function delete(string $entry) : bool { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; - - return Filesystem::deleteDir($entry_file); + return Filesystem::deleteDir(Entries::_dir_location($entry)); } /** @@ -234,10 +229,7 @@ class Entries */ public static function copy(string $entry, string $new_entry, bool $recursive = false) : bool { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; - $new_entry_file = PATH['entries'] . '/' . $new_entry . '/entry.yaml'; - - return Filesystem::copy($entry_file, $new_entry_file, $recursive); + return Filesystem::copy(Entries::_dir_location($entry), Entries::_dir_location($new_entry), $recursive); } /** @@ -249,8 +241,30 @@ class Entries */ public static function has(string $entry) : bool { - $entry_file = PATH['entries'] . '/' . $entry . '/entry.yaml'; + return Filesystem::has(Entries::_file_location($entry)); + } - return Filesystem::has($entry_file); + /** + * Helper method _file_location + * + * @access private + * @param string $name Name + * @return string + */ + private static function _file_location($name) + { + return PATH['entries'] . '/' . $name . '/entry.yaml'; + } + + /** + * Helper method _dir_location + * + * @access private + * @param string $name Name + * @return string + */ + private static function _dir_location($name) + { + return PATH['entries'] . '/' . $name; } } From 6e9d53ac28305c1c00676f1a24fbcebc0638e59e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 16:46:06 +0300 Subject: [PATCH 0535/1219] Flextype Core: Snippets API - improvements and fixes --- flextype/Snippets.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index cb1510de..67f9ba0b 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -45,10 +45,7 @@ class Snippets */ public static function rename(string $snippet, string $new_snippet) : bool { - $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; - $new_snippet_file = PATH['snippets'] . '/' . $new_snippet . '.php'; - - return rename($snippet_file, $new_snippet_file); + return rename(Snippets::_file_location($snippet), Snippets::_file_location($new_snippet)); } /** @@ -61,7 +58,7 @@ class Snippets */ public static function update(string $snippet, string $data) : bool { - $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + $snippet_file = Snippets::_file_location($snippet); if (Filesystem::has($snippet_file)) { return Filesystem::write($snippet_file, $data); @@ -80,7 +77,7 @@ class Snippets */ public static function create(string $snippet, string $data = '') : bool { - $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; + $snippet_file = Snippets::_file_location($snippet); // Check if new entry file exists if (!Filesystem::has($snippet_file)) { @@ -99,9 +96,7 @@ class Snippets */ public static function delete(string $snippet) : bool { - $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; - - return Filesystem::delete($snippet_file); + return Filesystem::delete(Snippets::_file_location($snippet)); } /** @@ -114,10 +109,7 @@ class Snippets */ public static function copy(string $snippet, string $new_snippet) : bool { - $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; - $new_snippet_file = PATH['snippets'] . '/' . $new_snippet . '.php'; - - return Filesystem::copy($snippet_file, $new_snippet_file, false); + return Filesystem::copy(Snippets::_file_location($snippet), Snippets::_file_location($new_snippet), false); } /** @@ -129,9 +121,7 @@ class Snippets */ public static function has(string $snippet) : bool { - $snippet_file = PATH['snippets'] . '/' . $snippet . '.php'; - - return Filesystem::has($snippet_file); + return Filesystem::has(Snippets::_file_location($snippet)); } /** @@ -151,7 +141,7 @@ class Snippets $name = (isset($fetch)) ? (string) $fetch : ''; // Define snippet path - $snippet_file = PATH['snippets'] . '/' . $name . '.php'; + $snippet_file = Snippets::_file_location($name); // Process snippet if (Filesystem::has($snippet_file)) { @@ -168,4 +158,16 @@ class Snippets throw new \RuntimeException("Snippet {$name} does not exist."); } } + + /** + * Helper method _file_location + * + * @access private + * @param string $name Name + * @return string + */ + private static function _file_location($name) + { + return PATH['snippets'] . '/' . $name . '.php'; + } } From c53ed2aa4369ebeace39e24ded88571f6e2548bf Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 18:14:01 +0300 Subject: [PATCH 0536/1219] Admin Panel: Settings Manager - code cleanup and refactoring. --- .../plugins/admin/classes/SettingsManager.php | 65 +++++++++++++------ 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 534f5fa4..03e31689 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -16,17 +16,20 @@ class SettingsManager { Registry::set('sidebar_menu_item', 'settings'); - // Clear cache - if (Http::get('clear_cache') !== null && Http::get('clear_cache') == '1' && Http::get('token') !== null) { - if (Token::check((Http::get('token')))) { - Cache::clear(); - Notification::set('success', __('admin_message_cache_files_deleted')); - Http::redirect(Http::getBaseUrl() . '/admin/settings'); - } else { - throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); - } - } + SettingsManager::clearCache(); + SettingsManager::saveSettings(); + Themes::view('admin/views/templates/system/settings/list') + ->assign('settings', Registry::get('settings')) + ->assign('cache_driver', SettingsManager::cacheDriverList()) + ->assign('locales', SettingsManager::localesList()) + ->assign('entries', SettingsManager::entriesList()) + ->assign('themes', SettingsManager::themesList()) + ->display(); + } + + private static function saveSettings() + { if (Http::post('action') !== null && Http::post('action') == 'save-form' && Http::post('token') !== null) { if (Token::check((Http::post('token')))) { @@ -49,7 +52,24 @@ class SettingsManager throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } } + } + private static function clearCache() + { + // Clear cache + if (Http::get('clear_cache') !== null && Http::get('clear_cache') == '1' && Http::get('token') !== null) { + if (Token::check((Http::get('token')))) { + Cache::clear(); + Notification::set('success', __('admin_message_cache_files_deleted')); + Http::redirect(Http::getBaseUrl() . '/admin/settings'); + } else { + throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); + } + } + } + + private static function localesList() + { $available_locales = Filesystem::listContents(PATH['plugins'] . '/admin/languages/'); $system_locales = Plugins::getLocales(); @@ -61,12 +81,22 @@ class SettingsManager } } + return $locales; + } + + private static function entriesList() + { $entries = []; foreach (Entries::fetchAll('', 'date', 'DESC') as $entry) { $entries[$entry['slug']] = $entry['title']; } + return $entries; + } + + private static function themesList() + { $themes = []; foreach (Filesystem::listContents(PATH['themes']) as $theme) { @@ -75,7 +105,12 @@ class SettingsManager } } - $cache_driver = ['auto' => 'Auto Detect', + return $themes; + } + + private static function cacheDriverList() + { + return ['auto' => 'Auto Detect', 'file' => 'File', 'apcu' => 'APCu', 'wincache' => 'WinCache', @@ -84,13 +119,5 @@ class SettingsManager 'sqlite3' => 'SQLite3', 'zend' => 'Zend', 'array' => 'Array']; - - Themes::view('admin/views/templates/system/settings/list') - ->assign('settings', Registry::get('settings')) - ->assign('cache_driver', $cache_driver) - ->assign('locales', $locales) - ->assign('entries', $entries) - ->assign('themes', $themes) - ->display(); } } From 390ac52ed377cb81fd64d352eb084e638990908c Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 18:17:33 +0300 Subject: [PATCH 0537/1219] Admin Panel: Settings Manager - code cleanup and refactoring. --- site/plugins/admin/classes/SettingsManager.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php index 03e31689..e3f6e0f0 100644 --- a/site/plugins/admin/classes/SettingsManager.php +++ b/site/plugins/admin/classes/SettingsManager.php @@ -46,8 +46,11 @@ class SettingsManager if (Filesystem::write(PATH['config']['site'] . '/settings.yaml', YamlParser::encode(array_merge(Registry::get('settings'), $settings)))) { Notification::set('success', __('admin_message_settings_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/settings'); + } else { + Notification::set('error', __('admin_message_settings_was_not_saved')); } + + Http::redirect(Http::getBaseUrl() . '/admin/settings'); } else { throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again."); } From 3cb8ccb05b9d22a126c5f73a8b810154c0edb6b5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 18:17:46 +0300 Subject: [PATCH 0538/1219] Admin Panel: Translates updates. --- site/plugins/admin/languages/en_US.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/en_US.yaml b/site/plugins/admin/languages/en_US.yaml index e10e75c9..381de786 100755 --- a/site/plugins/admin/languages/en_US.yaml +++ b/site/plugins/admin/languages/en_US.yaml @@ -160,6 +160,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 149c5135e94b9954bf494133d16aa5bde7b4a944 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:17 +0300 Subject: [PATCH 0539/1219] New translations en_US.yaml (Afrikaans) --- site/plugins/admin/languages/af_ZA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/af_ZA.yaml b/site/plugins/admin/languages/af_ZA.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/af_ZA.yaml +++ b/site/plugins/admin/languages/af_ZA.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From e568f154589a9bda2012b7a6f6bc6e2d6706086d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:25 +0300 Subject: [PATCH 0540/1219] New translations en_US.yaml (Japanese) --- site/plugins/admin/languages/ja_JP.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ja_JP.yaml b/site/plugins/admin/languages/ja_JP.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/ja_JP.yaml +++ b/site/plugins/admin/languages/ja_JP.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 102140f321432fc6916bda9b2823787cbecbf0c6 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:28 +0300 Subject: [PATCH 0541/1219] New translations en_US.yaml (Ukrainian) --- site/plugins/admin/languages/uk_UA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/uk_UA.yaml b/site/plugins/admin/languages/uk_UA.yaml index bc8e6271..e45f7ace 100644 --- a/site/plugins/admin/languages/uk_UA.yaml +++ b/site/plugins/admin/languages/uk_UA.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 57b4eac4c5cc3d8860a0ad27b12a7ddc7cfbe834 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:31 +0300 Subject: [PATCH 0542/1219] New translations en_US.yaml (Turkish) --- site/plugins/admin/languages/tr_TR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/tr_TR.yaml b/site/plugins/admin/languages/tr_TR.yaml index 645a17ae..2951c47e 100644 --- a/site/plugins/admin/languages/tr_TR.yaml +++ b/site/plugins/admin/languages/tr_TR.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Genişlik" From f13e307ed2149208dba5203a91d225decab8b4f1 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:34 +0300 Subject: [PATCH 0543/1219] New translations en_US.yaml (Swedish) --- site/plugins/admin/languages/sv_SE.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/sv_SE.yaml b/site/plugins/admin/languages/sv_SE.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/sv_SE.yaml +++ b/site/plugins/admin/languages/sv_SE.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 860c4722919d8e204585e64aec8484aec18b1d54 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:36 +0300 Subject: [PATCH 0544/1219] New translations en_US.yaml (Spanish) --- site/plugins/admin/languages/es_ES.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/es_ES.yaml b/site/plugins/admin/languages/es_ES.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/es_ES.yaml +++ b/site/plugins/admin/languages/es_ES.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From d9ac5546f472562fb00997960e37f1b55c599809 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:38 +0300 Subject: [PATCH 0545/1219] New translations en_US.yaml (Serbian (Cyrillic)) --- site/plugins/admin/languages/sr_SP.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/sr_SP.yaml b/site/plugins/admin/languages/sr_SP.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/sr_SP.yaml +++ b/site/plugins/admin/languages/sr_SP.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 10f14856fdb0e229d08851b5cb0707943ef6f5ea Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:40 +0300 Subject: [PATCH 0546/1219] New translations en_US.yaml (Russian) --- site/plugins/admin/languages/ru_RU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ru_RU.yaml b/site/plugins/admin/languages/ru_RU.yaml index 6ddf0923..ae640cd3 100644 --- a/site/plugins/admin/languages/ru_RU.yaml +++ b/site/plugins/admin/languages/ru_RU.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Запись перемещена" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Запись переименована" admin_message_settings_saved: "Настройки сохранены" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Неверное имя пользователя или пароль" admin_quality: "Качество" admin_width: "Ширина" From 048919b1ca75dfd9a122471046866465ffad686f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:42 +0300 Subject: [PATCH 0547/1219] New translations en_US.yaml (Romanian) --- site/plugins/admin/languages/ro_RO.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ro_RO.yaml b/site/plugins/admin/languages/ro_RO.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/ro_RO.yaml +++ b/site/plugins/admin/languages/ro_RO.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From d1f30c7fa2b81453eac3a67e6e2b3aed5e73dc2d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:44 +0300 Subject: [PATCH 0548/1219] New translations en_US.yaml (Portuguese, Brazilian) --- site/plugins/admin/languages/pt_BR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pt_BR.yaml b/site/plugins/admin/languages/pt_BR.yaml index 284e0d4b..56a3e4b3 100644 --- a/site/plugins/admin/languages/pt_BR.yaml +++ b/site/plugins/admin/languages/pt_BR.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 6d789b17a5b51ba7f3de5b3fb226cdeec3425b01 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:46 +0300 Subject: [PATCH 0549/1219] New translations en_US.yaml (Portuguese) --- site/plugins/admin/languages/pt_PT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pt_PT.yaml b/site/plugins/admin/languages/pt_PT.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/pt_PT.yaml +++ b/site/plugins/admin/languages/pt_PT.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 61ec950bef68d4de3fe794205dd9a07b36d0548c Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:48 +0300 Subject: [PATCH 0550/1219] New translations en_US.yaml (Polish) --- site/plugins/admin/languages/pl_PL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/pl_PL.yaml b/site/plugins/admin/languages/pl_PL.yaml index 1b1b544d..7af81841 100644 --- a/site/plugins/admin/languages/pl_PL.yaml +++ b/site/plugins/admin/languages/pl_PL.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Wpis został przeniesiony" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Zmieniono nazwę wpisu" admin_message_settings_saved: "Ustawienia zapisane" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Zła nazwa użytkownika lub hasło" admin_quality: "Jakość" admin_width: "Szerokość" From caf9123ccc9121ce168c7b6bb557873065d15260 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:49 +0300 Subject: [PATCH 0551/1219] New translations en_US.yaml (Norwegian) --- site/plugins/admin/languages/no_NO.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/no_NO.yaml b/site/plugins/admin/languages/no_NO.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/no_NO.yaml +++ b/site/plugins/admin/languages/no_NO.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From f560493b24f3903d277df8352a99e0b9a1a7103b Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:51 +0300 Subject: [PATCH 0552/1219] New translations en_US.yaml (Korean) --- site/plugins/admin/languages/ko_KR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ko_KR.yaml b/site/plugins/admin/languages/ko_KR.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/ko_KR.yaml +++ b/site/plugins/admin/languages/ko_KR.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 10e95b2c836345cc7ec0797b23bc4ace3d35e0ea Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:55 +0300 Subject: [PATCH 0553/1219] New translations en_US.yaml (Italian) --- site/plugins/admin/languages/it_IT.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/it_IT.yaml b/site/plugins/admin/languages/it_IT.yaml index 82490b86..382fd025 100644 --- a/site/plugins/admin/languages/it_IT.yaml +++ b/site/plugins/admin/languages/it_IT.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 051e259a0b249c2df95b819959ae3efe1786f74e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:57 +0300 Subject: [PATCH 0554/1219] New translations en_US.yaml (Arabic) --- site/plugins/admin/languages/ar_SA.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ar_SA.yaml b/site/plugins/admin/languages/ar_SA.yaml index af35c6bb..d1d6bfee 100644 --- a/site/plugins/admin/languages/ar_SA.yaml +++ b/site/plugins/admin/languages/ar_SA.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 96e4c0416701f81485d1dda2979f407c8a061f66 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:33:59 +0300 Subject: [PATCH 0555/1219] New translations en_US.yaml (Hungarian) --- site/plugins/admin/languages/hu_HU.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/hu_HU.yaml b/site/plugins/admin/languages/hu_HU.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/hu_HU.yaml +++ b/site/plugins/admin/languages/hu_HU.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 47c9397fbf1df5b72e39219dac14bd0f3b3dc957 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:01 +0300 Subject: [PATCH 0556/1219] New translations en_US.yaml (Hebrew) --- site/plugins/admin/languages/he_IL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/he_IL.yaml b/site/plugins/admin/languages/he_IL.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/he_IL.yaml +++ b/site/plugins/admin/languages/he_IL.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From b3c9829772bd17b1033031ac32c8c32232a4e08d Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:03 +0300 Subject: [PATCH 0557/1219] New translations en_US.yaml (Greek) --- site/plugins/admin/languages/el_GR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/el_GR.yaml b/site/plugins/admin/languages/el_GR.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/el_GR.yaml +++ b/site/plugins/admin/languages/el_GR.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From b1d107567a9fd27578364bb83eb9b14d7e6bf19f Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:04 +0300 Subject: [PATCH 0558/1219] New translations en_US.yaml (German) --- site/plugins/admin/languages/de_DE.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/de_DE.yaml b/site/plugins/admin/languages/de_DE.yaml index 12661490..f7304534 100644 --- a/site/plugins/admin/languages/de_DE.yaml +++ b/site/plugins/admin/languages/de_DE.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Eintrag verschoben" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Eintrag umbenannt" admin_message_settings_saved: "Einstellungen gespeichert" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Benutzername oder Passwort falsch" admin_quality: "Qualität" admin_width: "Breite" From af13c546a05465bfaae6932dd86fd30f355172aa Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:06 +0300 Subject: [PATCH 0559/1219] New translations en_US.yaml (French) --- site/plugins/admin/languages/fr_FR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/fr_FR.yaml b/site/plugins/admin/languages/fr_FR.yaml index ae98ae93..28b09a08 100644 --- a/site/plugins/admin/languages/fr_FR.yaml +++ b/site/plugins/admin/languages/fr_FR.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 4bc692afb832ea770decf98a6575b3e3b8b641eb Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:09 +0300 Subject: [PATCH 0560/1219] New translations en_US.yaml (Finnish) --- site/plugins/admin/languages/fi_FI.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/fi_FI.yaml b/site/plugins/admin/languages/fi_FI.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/fi_FI.yaml +++ b/site/plugins/admin/languages/fi_FI.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 3243b6dd33eee572aada6515ba676dcc651822df Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:11 +0300 Subject: [PATCH 0561/1219] New translations en_US.yaml (Dutch) --- site/plugins/admin/languages/nl_NL.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/nl_NL.yaml b/site/plugins/admin/languages/nl_NL.yaml index faf7b1a9..a0d4fe77 100644 --- a/site/plugins/admin/languages/nl_NL.yaml +++ b/site/plugins/admin/languages/nl_NL.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 67c958a5fc934e5cf31180968e1b17a75ef83577 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:15 +0300 Subject: [PATCH 0562/1219] New translations en_US.yaml (Danish) --- site/plugins/admin/languages/da_DK.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/da_DK.yaml b/site/plugins/admin/languages/da_DK.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/da_DK.yaml +++ b/site/plugins/admin/languages/da_DK.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 31ace4825d189b1ae5825dad61f32166071c061e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:17 +0300 Subject: [PATCH 0563/1219] New translations en_US.yaml (Czech) --- site/plugins/admin/languages/cs_CZ.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/cs_CZ.yaml b/site/plugins/admin/languages/cs_CZ.yaml index b1663400..734303f7 100644 --- a/site/plugins/admin/languages/cs_CZ.yaml +++ b/site/plugins/admin/languages/cs_CZ.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Stránka byla přesunuta" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Stránka byla přejmenována" admin_message_settings_saved: "Nastavení uloženo" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Špatné uživatelské jméno nebo heslo" admin_quality: "Quality" admin_width: "Width" From ea139a7efa46cb0017bae00ce5d1f07e46226412 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:19 +0300 Subject: [PATCH 0564/1219] New translations en_US.yaml (Croatian) --- site/plugins/admin/languages/hr_HR.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/hr_HR.yaml b/site/plugins/admin/languages/hr_HR.yaml index 1605a579..e1f21a1e 100644 --- a/site/plugins/admin/languages/hr_HR.yaml +++ b/site/plugins/admin/languages/hr_HR.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Unos je premješten" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Unos je preimenovan" admin_message_settings_saved: "Postavke su sačuvane" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Pogrešno korisničko ime ili lozinka" admin_quality: "Kvaliteta" admin_width: "Širina" From 41c8c9468b55fdf98dfd6f3f580693a0f0d1d737 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:20 +0300 Subject: [PATCH 0565/1219] New translations en_US.yaml (Chinese Traditional) --- site/plugins/admin/languages/zh_TW.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/zh_TW.yaml b/site/plugins/admin/languages/zh_TW.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/zh_TW.yaml +++ b/site/plugins/admin/languages/zh_TW.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 2340c4e4e8aa1044f06c7be227c550a98dc20d6e Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:22 +0300 Subject: [PATCH 0566/1219] New translations en_US.yaml (Chinese Simplified) --- site/plugins/admin/languages/zh_CN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/zh_CN.yaml b/site/plugins/admin/languages/zh_CN.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/zh_CN.yaml +++ b/site/plugins/admin/languages/zh_CN.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 8cea4863e01e45f3006eeb77178eb68a70b03e81 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:24 +0300 Subject: [PATCH 0567/1219] New translations en_US.yaml (Catalan) --- site/plugins/admin/languages/ca_ES.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/ca_ES.yaml b/site/plugins/admin/languages/ca_ES.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/ca_ES.yaml +++ b/site/plugins/admin/languages/ca_ES.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From 126940742bc7b9a299feaa96a9d42ade09d939a8 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Wed, 20 Feb 2019 18:34:25 +0300 Subject: [PATCH 0568/1219] New translations en_US.yaml (Vietnamese) --- site/plugins/admin/languages/vi_VN.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/languages/vi_VN.yaml b/site/plugins/admin/languages/vi_VN.yaml index f2cda261..7e56d751 100644 --- a/site/plugins/admin/languages/vi_VN.yaml +++ b/site/plugins/admin/languages/vi_VN.yaml @@ -161,6 +161,7 @@ admin_message_entry_moved: "Entry moved" admin_message_entry_was_not_moved: "Entry was not moved" admin_message_entry_renamed: "Entry renamed" admin_message_settings_saved: "Settings saved" +admin_message_settings_was_not_saved: "Settings was not saved" admin_message_wrong_username_password: "Wrong username or password" admin_quality: "Quality" admin_width: "Width" From bc2d8bc980d6bca61917a50c8a5a5c59f5b4265c Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 19:19:01 +0300 Subject: [PATCH 0569/1219] Admin Panel: Translates updates. --- site/plugins/admin/views/templates/extends/templates/add.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/templates/add.php b/site/plugins/admin/views/templates/extends/templates/add.php index b21c12fd..6a7e641a 100644 --- a/site/plugins/admin/views/templates/extends/templates/add.php +++ b/site/plugins/admin/views/templates/extends/templates/add.php @@ -32,7 +32,7 @@ Themes::view('admin/views/partials/content-start')->display();
'templateName']) ?> - 'form-control', 'id' => 'templateName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_templates_error_name_empty_input')]) ?> + 'form-control', 'id' => 'templateName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?>
'templateType']) ?> From 37bb3709b5776ff585ae17d259311f6e8a37ac8b Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 20 Feb 2019 19:21:53 +0300 Subject: [PATCH 0570/1219] Admin Panel: Snippets Manager - code cleanup and refactoring. --- site/plugins/admin/views/templates/extends/snippets/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/views/templates/extends/snippets/list.php b/site/plugins/admin/views/templates/extends/snippets/list.php index a4c028c6..9b2296c8 100644 --- a/site/plugins/admin/views/templates/extends/snippets/list.php +++ b/site/plugins/admin/views/templates/extends/snippets/list.php @@ -71,7 +71,7 @@
ROOT_DIR . '/.htaccess']) ?>
ROOT_DIR . '/index.php']) ?>
+ + + + + + + + + {% for key, plugin in plugins_list %} + + + + + + {% endfor %} + +
{{ tr('admin_name') }}{{ tr('admin_status') }}
{{ plugin.name }} + {{ tr('admin_info') }} + +
+ + + + +
+
+ + + + +{% endblock %} diff --git a/site/plugins/admin/views/templates/users/login.html b/site/plugins/admin/views/templates/users/login.html new file mode 100644 index 00000000..c62620a9 --- /dev/null +++ b/site/plugins/admin/views/templates/users/login.html @@ -0,0 +1,24 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ + +
+
+

{{ tr('admin_login') }}

+
+ + +
+
+ + +
+
+ +
+
+
+
+{% endblock %} From 2ff4203c211cdf5dfaafa6aebaf211988cf486a7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 19 Mar 2019 17:02:24 +0300 Subject: [PATCH 0656/1219] Admin Panel - Slim Integration - next round of integration --- .../admin/classes/NavigationManager.php | 22 ------------------- site/plugins/admin/classes/PluginsManager.php | 3 ++- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 site/plugins/admin/classes/NavigationManager.php diff --git a/site/plugins/admin/classes/NavigationManager.php b/site/plugins/admin/classes/NavigationManager.php deleted file mode 100644 index 108e0885..00000000 --- a/site/plugins/admin/classes/NavigationManager.php +++ /dev/null @@ -1,22 +0,0 @@ -registry->set("admin_navigation.{$area}.{$item}.area", $area); - $flextype->registry->set("admin_navigation.{$area}.{$item}.item", $item); - $flextype->registry->set("admin_navigation.{$area}.{$item}.title", $title); - $flextype->registry->set("admin_navigation.{$area}.{$item}.link", $link); - $flextype->registry->set("admin_navigation.{$area}.{$item}.attributes", $attributes); - } - - public static function getItems(string $area) - { - return Registry::get("admin_navigation.{$area}"); - } -} diff --git a/site/plugins/admin/classes/PluginsManager.php b/site/plugins/admin/classes/PluginsManager.php index e58e01a7..d4c5dc51 100644 --- a/site/plugins/admin/classes/PluginsManager.php +++ b/site/plugins/admin/classes/PluginsManager.php @@ -17,7 +17,8 @@ $app->get('/admin/plugins', function (Request $request, Response $response, arra return $this->view->render($response, 'plugins/admin/views/templates/extends/plugins/index.html', [ 'registry' => $this->get('registry')->dump(), - 'plugins_list' => $this->get('registry')->get('plugins') + 'plugins_list' => $this->get('registry')->get('plugins'), + 'menu_item' => 'plugins' ]); })->setName('plugins'); From 593421f892acc05ad408a33ba10c8822127183ce Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 19 Mar 2019 17:02:36 +0300 Subject: [PATCH 0657/1219] Admin Panel - Slim Integration - next round of integration --- site/plugins/admin/views/partials/base.html | 44 +++++++++++++------ .../templates/extends/plugins/index.html | 1 - 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index 1332021f..156a42f6 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -65,30 +65,48 @@
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - 0): ?> - () - - -
- - - -
- -
- - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/content/entries/move.html b/site/plugins/admin/views/templates/content/entries/move.html index f08ce944..5e811286 100644 --- a/site/plugins/admin/views/templates/content/entries/move.html +++ b/site/plugins/admin/views/templates/content/entries/move.html @@ -11,7 +11,7 @@
- {% for key, value in entries_list %} {% endfor %} diff --git a/site/plugins/admin/views/templates/content/entries/move.php b/site/plugins/admin/views/templates/content/entries/move.php deleted file mode 100644 index e58cdc74..00000000 --- a/site/plugins/admin/views/templates/content/entries/move.php +++ /dev/null @@ -1,44 +0,0 @@ - - -display(); - Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'entries_move' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/move', - 'title' => __('admin_move'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('entry', $entry) - ->display(); - Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - - - -
- - 'form-control')) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/content/entries/rename.php b/site/plugins/admin/views/templates/content/entries/rename.php deleted file mode 100644 index 7b3439b4..00000000 --- a/site/plugins/admin/views/templates/content/entries/rename.php +++ /dev/null @@ -1,46 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'entries_add' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/rename', - 'title' => __('admin_rename'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('entry', $entry) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - - - -
- 'entryName']) ?> - 'form-control', 'id' => 'entryName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/content/entries/type.php b/site/plugins/admin/views/templates/content/entries/type.php deleted file mode 100644 index b0c9b1e2..00000000 --- a/site/plugins/admin/views/templates/content/entries/type.php +++ /dev/null @@ -1,42 +0,0 @@ - - -display(); - Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/entries', - 'title' => __('admin_entries'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'entries_move' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/move', - 'title' => __('admin_type'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('entry', Http::get('entry')) - ->display(); - Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - -
- - 'form-control']) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> From d5af5a8af398ff37a372858846005020e5cc7c80 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 22:24:52 +0300 Subject: [PATCH 0755/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/app/Controllers/EntriesController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 02e95bc5..f4ca5925 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -346,6 +346,12 @@ class EntriesController extends Controller public function duplicateProcess($request, $response, $args) { + $entry_name = $this->getEntriesQuery($request->getQueryParams()['entry']); + $this->entries->copy($entry_name, $entry_name . '-duplicate-' . date("Ymd_His"), true); + + $this->flash->addMessage('success', __('admin_message_entry_duplicated')); + + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . implode('/', array_slice(explode("/", $entry_name), 0, -1))); } } From 290e12de80c5a7a4e479795cd18295448b3f9c5a Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 16 May 2019 22:43:24 +0300 Subject: [PATCH 0756/1219] Flextype Core: Entries - fixes. --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index eb5b22b7..b68dfc6d 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -246,7 +246,7 @@ class Entries * @param bool $recursive Recursive copy entries. * @return bool True on success, false on failure. */ - public function copy(string $entry, string $new_entry, bool $recursive = false) : bool + public function copy(string $entry, string $new_entry, bool $recursive = false) { return Filesystem::copy($this->_dir_location($entry), $this->_dir_location($new_entry), $recursive); } From 25b09c1f020df61eff86f1148a6621943e3aa319 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 17 May 2019 11:01:11 +0300 Subject: [PATCH 0757/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/views/templates/content/entries/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/content/entries/index.html b/site/plugins/admin/views/templates/content/entries/index.html index a68e7ec1..d17514f9 100644 --- a/site/plugins/admin/views/templates/content/entries/index.html +++ b/site/plugins/admin/views/templates/content/entries/index.html @@ -37,7 +37,7 @@
- {{ tr('admin_edit') }} + {{ tr('admin_edit') }} From 48dae3810e8a954d42e566bc178bc202ffd7700f Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 11:47:04 +0300 Subject: [PATCH 0758/1219] Flextype Core: Themes - fixes. --- flextype/Themes.php | 34 +++++++++++++++++++++++----------- flextype/bootstrap.php | 7 +++++++ 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index f27c487d..63f082d6 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -16,34 +16,46 @@ use Flextype\Component\Filesystem\Filesystem; class Themes { + /** + * Flextype Dependency Container + */ + private $flextype; + /** * Private construct method to enforce singleton behavior. * * @access private */ - public function __construct() + public function __construct($flextype) { + $this->flextype = $flextype; + $this->init($flextype, $app); + } + + public function init($flextype, $app) + { + // Get current theme - $theme = Registry::get('settings.theme'); + $theme = $this->flextype['registry']->get('settings.theme'); // Set empty themes items - Registry::set('themes', []); + $this->flextype['registry']->set('themes', []); // Create Unique Cache ID for Theme $theme_cache_id = md5('theme' . filemtime(PATH['themes'] . '/' . $theme . '/' . 'settings.json') . filemtime(PATH['themes'] . '/' . $theme . '/' . $theme . '.json')); // Get Theme mafifest file and write to settings.themes array - if (Cache::contains($theme_cache_id)) { - Registry::set('themes.' . Registry::get('settings.theme'), Cache::fetch($theme_cache_id)); + if ($this->flextype['cache']->contains($theme_cache_id)) { + $this->flextype['registry']->set('themes.' . $this->flextype['registry']->get('settings.theme'), $this->flextype['cache']->fetch($theme_cache_id)); } else { if (Filesystem::has($theme_settings = PATH['themes'] . '/' . $theme . '/' . 'settings.json') and Filesystem::has($theme_config = PATH['themes'] . '/' . $theme . '/' . $theme . '.json')) { $theme_settings = JsonParser::decode(Filesystem::read($theme_settings)); $theme_config = JsonParser::decode(Filesystem::read($theme_config)); $_theme = array_merge($theme_settings, $theme_config); - Registry::set('themes.' . Registry::get('settings.theme'), $_theme); - Cache::save($theme_cache_id, $_theme); + $this->flextype['registry']->set('themes.' . $this->flextype['registry']->get('settings.theme'), $_theme); + $this->flextype['cache']->save($theme_cache_id, $_theme); } } } @@ -60,12 +72,12 @@ class Themes $partials = []; // Get partials files - $_partials = Filesystem::listContents(PATH['themes'] . '/' . Registry::get('settings.theme') . '/views/partials/'); + $_partials = Filesystem::listContents(PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/views/partials/'); // If there is any partials file then go... if (count($_partials) > 0) { foreach ($_partials as $partial) { - if ($partial['type'] == 'file' && $partial['extension'] == 'php') { + if ($partial['type'] == 'file' && $partial['extension'] == 'html') { $partials[$partial['basename']] = $partial['basename']; } } @@ -86,12 +98,12 @@ class Themes $templates = []; // Get templates files - $_templates = Filesystem::listContents(PATH['themes'] . '/' . Registry::get('settings.theme') . '/views/templates/'); + $_templates = Filesystem::listContents(PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/views/templates/'); // If there is any template file then go... if (count($_templates) > 0) { foreach ($_templates as $template) { - if ($template['type'] == 'file' && $template['extension'] == 'php') { + if ($template['type'] == 'file' && $template['extension'] == 'html') { $templates[$template['basename']] = $template['basename']; } } diff --git a/flextype/bootstrap.php b/flextype/bootstrap.php index a9bc7548..742635f2 100755 --- a/flextype/bootstrap.php +++ b/flextype/bootstrap.php @@ -320,6 +320,13 @@ $app->get('/image/{path:.+}', function (Request $request, Response $response, ar return $flextype['images']->getImageResponse($args['path'], $_GET); }); +/** + * Add themes service to Flextype container + */ + $flextype['themes'] = function($container) use ($flextype, $app) { + return new Themes($flextype, $app); + }; + /** * Add plugins service to Flextype container */ From 4c81488d58f8f83f54682ffc812a33c8640cdd49 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 12:05:01 +0300 Subject: [PATCH 0759/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../app/Controllers/EntriesController.php | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index f4ca5925..f0e4d6fb 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -354,4 +354,77 @@ class EntriesController extends Controller return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index') . '?entry=' . implode('/', array_slice(explode("/", $entry_name), 0, -1))); } + + public function edit($request, $response, $args) + { + $entry_name = $request->getQueryParams()['entry']; + + $entry = $this->entries->fetch($entry_name); + + // Fieldset for current entry template + $fieldset_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . '/fieldsets/' . (isset($entry['fieldset']) ? $entry['fieldset'] : 'default') . '.json'; + $fieldset = JsonParser::decode(Filesystem::read($fieldset_path)); + is_null($fieldset) and $fieldset = []; + + return $this->view->render($response, + 'plugins/admin/views/templates/content/entries/edit.html', [ + 'entry_name' => $entry_name, + 'entry' => $entry, + 'fieldset' => $fieldset, + 'templates' => $this->themes->getTemplates(), + 'files' => $this->getMediaList($entry_name), + 'menu_item' => 'entries', + 'links' => [ + 'entries' => [ + 'link' => $this->router->urlFor('admin.entries.index'), + 'title' => __('admin_entries'), + 'attributes' => ['class' => 'navbar-item'] + ] + ] + ]); + } + + public function getMediaList(string $entry, bool $path = false) : array + { + $files = []; + foreach (array_diff(scandir(PATH['entries'] . '/' . $entry), ['..', '.']) as $file) { + if (strpos($this->registry->get('settings.entries.media.accept_file_types'), $file_ext = substr(strrchr($file, '.'), 1)) !== false) { + if (strpos($file, strtolower($file_ext), 1)) { + if ($path) { + $files[$this->uri->getBaseUrl() . '/' . $entry . '/' . $file] = $this->uri->getBaseUrl() . '/' . $entry . '/' . $file; + } else { + $files[$file] = $file; + } + } + } + } + return $files; + } + + public function editProcess() + { + /* + $indenter = new Indenter(); + + $entry = Entries::fetch(Http::get('entry')); + Arr::delete($entry, 'slug'); + $data = []; + $_data = $_POST; + Arr::delete($_data, 'token'); + Arr::delete($_data, 'action'); + + foreach ($_data as $key => $_d) { + $data[$key] = $indenter->indent($_d); + } + + $data = array_merge($entry, $data); + + if (Entries::update(Http::get('entry'), $data)) { + Notification::set('success', __('admin_message_entry_changes_saved')); + } else { + Notification::set('error', __('admin_message_entry_changes_not_saved')); + } + Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry')); + */ + } } From bcee0708cb1ee0946298501ad4f1e6247aae56de Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 13:07:19 +0300 Subject: [PATCH 0760/1219] Flextype Core: bootstrap.php - updates: - Init themes - Twig Debug Extension --- flextype/bootstrap.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/flextype/bootstrap.php b/flextype/bootstrap.php index 742635f2..4dd701d5 100755 --- a/flextype/bootstrap.php +++ b/flextype/bootstrap.php @@ -48,7 +48,8 @@ $config = [ 'httpVersion' => '1.1', 'twig' => [ - 'cache' => false + 'cache' => false, + 'debug' => true, ], 'images' => [ @@ -282,6 +283,9 @@ $flextype['view'] = function ($container) { // Add Twig Extension $view->addExtension(new \Slim\Views\TwigExtension($router, $uri)); + // Add Twig Debug Extension + $view->addExtension(new \Twig\Extension\DebugExtension()); + // Add Entries Twig Extension $view->addExtension(new EntriesTwigExtension($container)); @@ -327,6 +331,12 @@ $app->get('/image/{path:.+}', function (Request $request, Response $response, ar return new Themes($flextype, $app); }; + /** + * Init themes + */ + $flextype['themes']->init($flextype, $app); + + /** * Add plugins service to Flextype container */ From 462a21a8f165c24f319d33999e0cc498b58ebfda Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 13:09:07 +0300 Subject: [PATCH 0761/1219] Flextype Core: Plugins - fixes. --- flextype/Plugins.php | 1 - 1 file changed, 1 deletion(-) diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 01ca688b..581f70d8 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -38,7 +38,6 @@ class Plugins { $this->flextype = $flextype; $this->locales = JsonParser::decode(Filesystem::read(ROOT_DIR . '/flextype/config/locales.json')); - $this->init($flextype, $app); } public function getLocales() From 74a79a562720182081cd58c166990d516554c501 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 13:09:14 +0300 Subject: [PATCH 0762/1219] Flextype Core: Themes - fixes. --- flextype/Themes.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index 63f082d6..3f962bce 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -29,7 +29,6 @@ class Themes public function __construct($flextype) { $this->flextype = $flextype; - $this->init($flextype, $app); } public function init($flextype, $app) @@ -98,7 +97,7 @@ class Themes $templates = []; // Get templates files - $_templates = Filesystem::listContents(PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/views/templates/'); + $_templates = Filesystem::listContents(PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/templates/'); // If there is any template file then go... if (count($_templates) > 0) { From 16aacb68d6150ce2c0f69e028a2c54bb4f2bc00c Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 13:17:31 +0300 Subject: [PATCH 0763/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../admin/app/Controllers/EntriesController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index f0e4d6fb..5a163d14 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -188,7 +188,7 @@ class EntriesController extends Controller return $this->view->render($response, 'plugins/admin/views/templates/content/entries/type.html', [ 'fieldset' => $entry['fieldset'], - 'entry' => $this->getEntriesQuery($request->getQueryParams()['entry']), + 'entry_name' => $this->getEntriesQuery($request->getQueryParams()['entry']), 'fieldsets' => $fieldsets, 'menu_item' => 'entries', 'links' => [ @@ -212,14 +212,14 @@ class EntriesController extends Controller $data = []; $_data = $request->getParsedBody(); - $entry_name = $_data['entry']; - $entry = $this->entries->fetch($_data['entry']); + $entry_name = $_data['entry_name']; + $entry = $this->entries->fetch($_data['entry_name']); Arr::delete($entry, 'slug'); Arr::delete($_data, 'csrf_name'); Arr::delete($_data, 'csrf_value'); Arr::delete($_data, 'type_entry'); - Arr::delete($_data, 'entry'); + Arr::delete($_data, 'entry_name'); $data = array_merge($entry, $_data); @@ -369,7 +369,7 @@ class EntriesController extends Controller return $this->view->render($response, 'plugins/admin/views/templates/content/entries/edit.html', [ 'entry_name' => $entry_name, - 'entry' => $entry, + 'entry_body' => $entry, 'fieldset' => $fieldset, 'templates' => $this->themes->getTemplates(), 'files' => $this->getMediaList($entry_name), From e40fcdded35b34ca64f068ca6cee6175a4efcf4d Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 14:03:26 +0300 Subject: [PATCH 0764/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- .../app/Controllers/EntriesController.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 5a163d14..c1e698d3 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -375,11 +375,21 @@ class EntriesController extends Controller 'files' => $this->getMediaList($entry_name), 'menu_item' => 'entries', 'links' => [ - 'entries' => [ - 'link' => $this->router->urlFor('admin.entries.index'), - 'title' => __('admin_entries'), + 'edit_entry' => [ + 'link' => $this->router->urlFor('admin.entries.edit') . '?entry=' . $entry_name, + 'title' => __('admin_content'), + 'attributes' => ['class' => 'navbar-item active'] + ], + 'edit_entry_media' => [ + 'link' => $this->router->urlFor('admin.entries.edit') . '?entry=' . $entry_name . '&media=true', + 'title' => __('admin_media'), 'attributes' => ['class' => 'navbar-item'] - ] + ], + 'edit_entry_source' => [ + 'link' => $this->router->urlFor('admin.entries.edit') . '?entry=' . $entry_name . '&source=true', + 'title' => __('admin_source'), + 'attributes' => ['class' => 'navbar-item'] + ], ] ]); } From fff2a5c810368c5d5933513b5449c2a44d5c228d Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 14:46:43 +0300 Subject: [PATCH 0765/1219] Flextype Box Plugin: Admin #125 #117 - Plugins Controller/Views implementation --- .../admin/app/Controllers/PluginsController.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/PluginsController.php b/site/plugins/admin/app/Controllers/PluginsController.php index c1360ce1..d59f3c95 100644 --- a/site/plugins/admin/app/Controllers/PluginsController.php +++ b/site/plugins/admin/app/Controllers/PluginsController.php @@ -15,7 +15,21 @@ class PluginsController extends Controller return $this->view->render($response, 'plugins/admin/views/templates/extends/plugins/index.html', [ 'plugins_list' => $this->registry->get('plugins'), - 'menu_item' => 'plugins' + 'menu_item' => 'plugins', + 'links' => [ + 'plugins' => [ + 'link' => $this->router->urlFor('admin.plugins.index'), + 'title' => __('admin_plugins'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + 'buttons' => [ + 'plugins_get_more' => [ + 'link' => 'https://github.com/flextype/plugins', + 'title' => __('admin_get_more_plugins'), + 'attributes' => ['float-right btn' => 'navbar-item', 'target' => '_blank'] + ], + ] ]); } From efae41355561534218219e08d73a4c2e53a5ecd0 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 14:47:48 +0300 Subject: [PATCH 0766/1219] Flextype Box Plugin: Admin #125 #117 - Plugins Controller/Views implementation --- .../views/templates/extends/plugins/list.php | 100 ------------------ 1 file changed, 100 deletions(-) delete mode 100644 site/plugins/admin/views/templates/extends/plugins/list.php diff --git a/site/plugins/admin/views/templates/extends/plugins/list.php b/site/plugins/admin/views/templates/extends/plugins/list.php deleted file mode 100644 index 3f96de7e..00000000 --- a/site/plugins/admin/views/templates/extends/plugins/list.php +++ /dev/null @@ -1,100 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'plugins' => [ - 'link' => Http::getBaseUrl() . '/admin/plugins', - 'title' => __('admin_plugins'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'plugins_get_more' => [ - 'link' => 'https://github.com/flextype/plugins', - 'title' => __('admin_get_more_plugins'), - 'attributes' => ['class' => 'float-right btn', 'target' => '_blank'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
- -
- - - - - - - - - - - $plugin): ?> - - - - - - - -
- - -
- - disabled> - - -
-
- - - - -display() ?> -display() ?> From 5769508d13624ac66f56ad662944702780a3a534 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 22 May 2019 14:48:00 +0300 Subject: [PATCH 0767/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/views/templates/content/entries/edit.html | 5 +++++ site/plugins/admin/views/templates/content/entries/type.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 site/plugins/admin/views/templates/content/entries/edit.html diff --git a/site/plugins/admin/views/templates/content/entries/edit.html b/site/plugins/admin/views/templates/content/entries/edit.html new file mode 100644 index 00000000..478f5dc1 --- /dev/null +++ b/site/plugins/admin/views/templates/content/entries/edit.html @@ -0,0 +1,5 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +@{{ dump(entry_body) }}@ +{% endblock %} diff --git a/site/plugins/admin/views/templates/content/entries/type.html b/site/plugins/admin/views/templates/content/entries/type.html index 2f1383ea..14cdf23f 100644 --- a/site/plugins/admin/views/templates/content/entries/type.html +++ b/site/plugins/admin/views/templates/content/entries/type.html @@ -6,7 +6,7 @@
- +
'. + ''; + } } From ea9bf43c32b628cbd911f67c204f919fc3f148fc Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 13:57:13 +0300 Subject: [PATCH 0783/1219] Slim Framework integration #118 #117 - CsrfTwigExtension updates --- flextype/twig/AssetsTwigExtension.php | 4 ++-- flextype/twig/EmitterTwigExtension.php | 2 +- flextype/twig/EntriesTwigExtension.php | 4 ++-- flextype/twig/FilesystemTwigExtension.php | 4 ++-- flextype/twig/I18nTwigExtension.php | 2 +- flextype/twig/JsonParserTwigExtension.php | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flextype/twig/AssetsTwigExtension.php b/flextype/twig/AssetsTwigExtension.php index 05823bd0..66f08aef 100644 --- a/flextype/twig/AssetsTwigExtension.php +++ b/flextype/twig/AssetsTwigExtension.php @@ -24,8 +24,8 @@ class AssetsTwigExtension extends \Twig_Extension public function getFunctions() { return [ - new \Twig_SimpleFunction('assets_add', array($this, 'add')), - new \Twig_SimpleFunction('assets_get', array($this, 'get')), + new \Twig_SimpleFunction('assets_add', [$this, 'add']), + new \Twig_SimpleFunction('assets_get', [$this, 'get']), ]; } diff --git a/flextype/twig/EmitterTwigExtension.php b/flextype/twig/EmitterTwigExtension.php index 6e837706..86c621b6 100644 --- a/flextype/twig/EmitterTwigExtension.php +++ b/flextype/twig/EmitterTwigExtension.php @@ -35,7 +35,7 @@ class EmitterTwigExtension extends \Twig_Extension public function getFunctions() { return [ - new \Twig_SimpleFunction('emmiter_emmit', array($this, 'emit')), + new \Twig_SimpleFunction('emmiter_emmit', [$this, 'emit']), ]; } diff --git a/flextype/twig/EntriesTwigExtension.php b/flextype/twig/EntriesTwigExtension.php index c8e1fffe..4a265b62 100644 --- a/flextype/twig/EntriesTwigExtension.php +++ b/flextype/twig/EntriesTwigExtension.php @@ -35,8 +35,8 @@ class EntriesTwigExtension extends \Twig_Extension public function getFunctions() { return [ - new \Twig_SimpleFunction('entries_fetch', array($this, 'fetch')), - new \Twig_SimpleFunction('entries_fetch_all', array($this, 'fetchAll')), + new \Twig_SimpleFunction('entries_fetch', [$this, 'fetch']), + new \Twig_SimpleFunction('entries_fetch_all', [$this, 'fetchAll']), ]; } diff --git a/flextype/twig/FilesystemTwigExtension.php b/flextype/twig/FilesystemTwigExtension.php index 4b1ded26..36403a49 100644 --- a/flextype/twig/FilesystemTwigExtension.php +++ b/flextype/twig/FilesystemTwigExtension.php @@ -24,8 +24,8 @@ class FilesystemTwigExtension extends \Twig_Extension public function getFunctions() { return [ - new \Twig_SimpleFunction('filesystem_has', array($this, 'has')), - new \Twig_SimpleFunction('filesystem_read', array($this, 'read')), + new \Twig_SimpleFunction('filesystem_has', [$this, 'has']), + new \Twig_SimpleFunction('filesystem_read', [$this, 'read']), ]; } diff --git a/flextype/twig/I18nTwigExtension.php b/flextype/twig/I18nTwigExtension.php index 62d69cb7..65a5abec 100644 --- a/flextype/twig/I18nTwigExtension.php +++ b/flextype/twig/I18nTwigExtension.php @@ -24,7 +24,7 @@ class I18nTwigExtension extends \Twig_Extension public function getFunctions() { return [ - new \Twig_SimpleFunction('tr', array($this, 'tr')), + new \Twig_SimpleFunction('tr', [$this, 'tr']), ]; } diff --git a/flextype/twig/JsonParserTwigExtension.php b/flextype/twig/JsonParserTwigExtension.php index ead72368..a9cfe3bd 100644 --- a/flextype/twig/JsonParserTwigExtension.php +++ b/flextype/twig/JsonParserTwigExtension.php @@ -22,8 +22,8 @@ class JsonParserTwigExtension extends \Twig_Extension public function getFunctions() { return [ - new \Twig_SimpleFunction('json_parser_decode', array($this, 'decode')), - new \Twig_SimpleFunction('json_parser_encode', array($this, 'encode')) + new \Twig_SimpleFunction('json_parser_decode', [$this, 'decode']), + new \Twig_SimpleFunction('json_parser_encode', [$this, 'encode']) ]; } From bf94e6c84205775ef0dec728a4acbb3ca0f4b36c Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 14:27:47 +0300 Subject: [PATCH 0784/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../app/Controllers/FieldsetsController.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index 4611a16a..2e73ba0b 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -2,6 +2,8 @@ namespace Flextype; +use Flextype\Component\Arr\Arr; +use Flextype\Component\Text\Text; use function Flextype\Component\I18n\__; class FieldsetsController extends Controller @@ -54,7 +56,21 @@ class FieldsetsController extends Controller public function addProcess($request, $response, $args) { + $data = $request->getParsedBody(); + Arr::delete($data, 'csrf_name'); + Arr::delete($data, 'csrf_value'); + + $id = Text::safeString($data['name'], '-', true); + $data = ['title' => $data['title']]; + + if ($this->fieldsets->create($id, $data)) { + $this->flash->addMessage('success', __('admin_message_fieldset_created')); + } else { + $this->flash->addMessage('error', __('admin_message_fieldset_was_not_created')); + } + + return $response->withRedirect($this->container->get('router')->urlFor('admin.fieldsets.index')); } public function edit($request, $response, $args) From 185341673d6eb1eca93d73c0cef4d90e0cfc0e86 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 14:52:09 +0300 Subject: [PATCH 0785/1219] Slim Framework integration #118 #117 - Fieldsets updates --- flextype/Fieldsets.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flextype/Fieldsets.php b/flextype/Fieldsets.php index e46cf0b5..0d306efe 100644 --- a/flextype/Fieldsets.php +++ b/flextype/Fieldsets.php @@ -76,15 +76,15 @@ class Fieldsets * * @access public * @param string $fieldset Fieldset - * @param string $data Data + * @param array $data Data * @return bool True on success, false on failure. */ - public function update(string $fieldset, string $data) : bool + public function update(string $fieldset, array $data) : bool { $fieldset_file = $this->_file_location($fieldset); if (Filesystem::has($fieldset_file)) { - return Filesystem::write($fieldset_file, $data); + return Filesystem::write($fieldset_file, JsonParser::encode($data)); } else { return false; } @@ -95,16 +95,16 @@ class Fieldsets * * @access public * @param string $fieldset Fieldset - * @param string $data Data + * @param array $data Data * @return bool True on success, false on failure. */ - public function create(string $fieldset, string $data = '') : bool + public function create(string $fieldset, array $data) : bool { $fieldset_file = $this->_file_location($fieldset); // Check if new entry file exists if (!Filesystem::has($fieldset_file)) { - return Filesystem::write($fieldset_file, $data); + return Filesystem::write($fieldset_file, JsonParser::encode($data)); } else { return false; } From f1e2317d3a655ab29551b15090559b971ca46d6a Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 14:52:54 +0300 Subject: [PATCH 0786/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../templates/extends/fieldsets/add.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/fieldsets/add.html b/site/plugins/admin/views/templates/extends/fieldsets/add.html index 39a8e6b7..1b3b8530 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/add.html +++ b/site/plugins/admin/views/templates/extends/fieldsets/add.html @@ -1,5 +1,22 @@ {% extends "plugins/admin/views/partials/base.html" %} {% block content %} -index + + {{ csrf() }} +
+
+
+ + +
+
+ + +
+
+ +
+
+
+ {% endblock %} From 686232d32387a8187660fb1d7c72c34faeb5cca3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 15:26:26 +0300 Subject: [PATCH 0787/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../views/templates/extends/fieldsets/index.html | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/views/templates/extends/fieldsets/index.html b/site/plugins/admin/views/templates/extends/fieldsets/index.html index 970d3893..c583b273 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/index.html +++ b/site/plugins/admin/views/templates/extends/fieldsets/index.html @@ -23,10 +23,22 @@
- {{ tr('admin_delete') }} + + + {{ tr('admin_delete') }} {% endfor %} From 406e7c6c056897b48ef3a439a6fa1e73775d4b63 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 15:26:41 +0300 Subject: [PATCH 0788/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../admin/app/Controllers/FieldsetsController.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index 2e73ba0b..263475e9 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -70,7 +70,7 @@ class FieldsetsController extends Controller $this->flash->addMessage('error', __('admin_message_fieldset_was_not_created')); } - return $response->withRedirect($this->container->get('router')->urlFor('admin.fieldsets.index')); + return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); } public function edit($request, $response, $args) @@ -95,11 +95,23 @@ class FieldsetsController extends Controller public function deleteProcess($request, $response, $args) { + if ($this->fieldsets->delete($request->getParsedBody()['fieldset-id'])) { + $this->flash->addMessage('success', __('admin_message_fieldset_deleted')); + } else { + $this->flash->addMessage('error', __('admin_message_fieldset_was_not_deleted')); + } + return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); } public function duplicateProcess($request, $response, $args) { + if ($this->fieldsets->copy($request->getParsedBody()['fieldset-id'], $request->getParsedBody()['fieldset-id'] . '-duplicate-' . date("Ymd_His"))) { + $this->flash->addMessage('success', __('admin_message_fieldset_duplicated')); + } else { + $this->flash->addMessage('error', __('admin_message_fieldset_was_not_duplicated')); + } + return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); } } From d56eb7b4c5119788ee6eb0e5aef7dcefefa37f50 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 24 May 2019 23:59:41 +0300 Subject: [PATCH 0789/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../templates/extends/fieldsets/add.html | 4 ++-- .../templates/extends/fieldsets/rename.html | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 site/plugins/admin/views/templates/extends/fieldsets/rename.html diff --git a/site/plugins/admin/views/templates/extends/fieldsets/add.html b/site/plugins/admin/views/templates/extends/fieldsets/add.html index 1b3b8530..fd53c91d 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/add.html +++ b/site/plugins/admin/views/templates/extends/fieldsets/add.html @@ -10,8 +10,8 @@
- - + +
diff --git a/site/plugins/admin/views/templates/extends/fieldsets/rename.html b/site/plugins/admin/views/templates/extends/fieldsets/rename.html new file mode 100644 index 00000000..0c3dc044 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/fieldsets/rename.html @@ -0,0 +1,19 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} + +
+
+
+ + +
+
+ +
+
+
+
+{% endblock %} From 2740b0d3601dc1fc86dbd38c7e46ba16497ba224 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 00:00:01 +0300 Subject: [PATCH 0790/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../app/Controllers/FieldsetsController.php | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index 263475e9..e8b0c2cd 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -61,7 +61,7 @@ class FieldsetsController extends Controller Arr::delete($data, 'csrf_name'); Arr::delete($data, 'csrf_value'); - $id = Text::safeString($data['name'], '-', true); + $id = Text::safeString($data['id'], '-', true); $data = ['title' => $data['title']]; if ($this->fieldsets->create($id, $data)) { @@ -85,11 +85,36 @@ class FieldsetsController extends Controller public function rename($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/fieldsets/rename.html', [ + 'menu_item' => 'fieldsets', + 'id' => $request->getQueryParams()['id'], + 'links' => [ + 'fieldsets' => [ + 'link' => $this->router->pathFor('admin.fieldsets.index'), + 'title' => __('admin_fieldsets'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + 'buttons' => [ + 'fieldsets_add' => [ + 'link' => $this->router->pathFor('admin.fieldsets.add'), + 'title' => __('admin_create_new_fieldset'), + 'attributes' => ['class' => 'float-right btn'] + ] + ] + ]); } public function renameProcess($request, $response, $args) { + if ($this->fieldsets->rename($request->getParsedBody()['fieldset-id-current'], $request->getParsedBody()['id'])) { + $this->flash->addMessage('success', __('admin_message_fieldset_renamed')); + } else { + $this->flash->addMessage('error', __('admin_message_fieldset_was_not_renamed')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); } From 019861428e43d072675ed21fa5f690eb45358c3c Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 12:52:44 +0300 Subject: [PATCH 0791/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../app/Controllers/FieldsetsController.php | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index e8b0c2cd..a293255c 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -75,7 +75,24 @@ class FieldsetsController extends Controller public function edit($request, $response, $args) { - + + return $this->view->render($response, + 'plugins/admin/views/templates/extends/fieldsets/edit.html', [ + 'menu_item' => 'fieldsets', + 'id' => $request->getQueryParams()['id'], + 'links' => [ + 'fieldsets' => [ + 'link' => $this->router->pathFor('admin.fieldsets.index'), + 'title' => __('admin_fieldsets'), + 'attributes' => ['class' => 'navbar-item active'] + ], + 'fieldsets_rename' => [ + 'link' => $this->router->pathFor('admin.fieldsets.rename') . '?id=' . $request->getQueryParams()['id'], + 'title' => __('admin_rename'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + ]); } public function editProcess($request, $response, $args) @@ -95,14 +112,12 @@ class FieldsetsController extends Controller 'title' => __('admin_fieldsets'), 'attributes' => ['class' => 'navbar-item active'] ], + 'fieldsets_rename' => [ + 'link' => $this->router->pathFor('admin.fieldsets.rename') . '?id=' . $request->getQueryParams()['id'], + 'title' => __('admin_rename'), + 'attributes' => ['class' => 'navbar-item active'] + ], ], - 'buttons' => [ - 'fieldsets_add' => [ - 'link' => $this->router->pathFor('admin.fieldsets.add'), - 'title' => __('admin_create_new_fieldset'), - 'attributes' => ['class' => 'float-right btn'] - ] - ] ]); } From bdee5686496d0f85073786685d36525577f34ced Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 12:53:22 +0300 Subject: [PATCH 0792/1219] Slim Framework integration #118 #117 - Fieldsets: new method fetch() added --- flextype/Fieldsets.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/flextype/Fieldsets.php b/flextype/Fieldsets.php index 0d306efe..64b4a8b6 100644 --- a/flextype/Fieldsets.php +++ b/flextype/Fieldsets.php @@ -31,6 +31,32 @@ class Fieldsets $this->flextype = $flextype; } + /** + * Fetch fieldsets + * + * @access public + * @param string $id Fieldsets id + * @return array|false The entry contents or false on failure. + */ + public function fetch(string $id) + { + $fieldsets_file = Fieldsets::_file_location($id); + + if (Filesystem::has($fieldsets_file)) { + if ($fieldsets_body = Filesystem::read($fieldsets_file)) { + if ($fieldsets_decoded = JsonParser::decode($fieldsets_body)) { + return $fieldsets_decoded; + } else { + return false; + } + } else { + return false; + } + } else { + return false; + } + } + /** * Fetch Fieldsets for current theme * From 45a9879f99974a0d993d5082e4eeafb5e417d99d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 13:01:58 +0300 Subject: [PATCH 0793/1219] Slim Framework integration #118 #117 - Fieldsets: refactoring --- flextype/Fieldsets.php | 69 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/flextype/Fieldsets.php b/flextype/Fieldsets.php index 64b4a8b6..a750abff 100644 --- a/flextype/Fieldsets.php +++ b/flextype/Fieldsets.php @@ -70,7 +70,7 @@ class Fieldsets // Get fieldsets files $_fieldsets = Filesystem::listContents($this->_dir_location()); - // If there is any template file then go... + // If there is any fieldsets file then go... if (count($_fieldsets) > 0) { foreach ($_fieldsets as $fieldset) { if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'json') { @@ -85,92 +85,91 @@ class Fieldsets } /** - * Rename fieldset + * Rename fieldsets * * @access public - * @param string $fieldset Fieldset - * @param string $new_fieldset New fieldset + * @param string $id Fieldsets id + * @param string $new_id New fieldsets id * @return bool True on success, false on failure. */ - public function rename(string $fieldset, string $new_fieldset) : bool + public function rename(string $id, string $new_id) : bool { - return rename($this->_file_location($fieldset), $this->_file_location($new_fieldset)); + return rename($this->_file_location($id), $this->_file_location($new_id)); } /** - * Update fieldset + * Update fieldsets * * @access public - * @param string $fieldset Fieldset - * @param array $data Data + * @param string $id Fieldsets id + * @param array $data Data to save * @return bool True on success, false on failure. */ - public function update(string $fieldset, array $data) : bool + public function update(string $id, array $data) : bool { - $fieldset_file = $this->_file_location($fieldset); + $fieldsets_file = $this->_file_location($id); - if (Filesystem::has($fieldset_file)) { - return Filesystem::write($fieldset_file, JsonParser::encode($data)); + if (Filesystem::has($fieldsets_file)) { + return Filesystem::write($fieldsets_file, JsonParser::encode($data)); } else { return false; } } /** - * Create fieldset + * Create fieldsets * * @access public - * @param string $fieldset Fieldset - * @param array $data Data + * @param string $id Fieldsets id + * @param array $data Data to save * @return bool True on success, false on failure. */ - public function create(string $fieldset, array $data) : bool + public function create(string $id, array $data) : bool { - $fieldset_file = $this->_file_location($fieldset); + $fieldsets_file = $this->_file_location($id); - // Check if new entry file exists - if (!Filesystem::has($fieldset_file)) { - return Filesystem::write($fieldset_file, JsonParser::encode($data)); + if (!Filesystem::has($fieldsets_file)) { + return Filesystem::write($fieldsets_file, JsonParser::encode($data)); } else { return false; } } /** - * Delete fieldset. + * Delete fieldsets * * @access public - * @param string $fieldset Fieldset + * @param string $id Fieldsets id * @return bool True on success, false on failure. */ - public function delete(string $fieldset) : bool + public function delete(string $id) : bool { - return Filesystem::delete($this->_file_location($fieldset)); + return Filesystem::delete($this->_file_location($id)); } /** * Copy fieldset * * @access public - * @param string $fieldset Fieldset - * @param string $new_fieldset New fieldset + * @param string $id Fieldsets id + * @param string $new_id New fieldsets id * @return bool True on success, false on failure. */ - public function copy(string $fieldset, string $new_fieldset) : bool + public function copy(string $id, string $new_id) : bool { - return Filesystem::copy($this->_file_location($fieldset), $this->_file_location($new_fieldset), false); + return Filesystem::copy($this->_file_location($id), $this->_file_location($new_id), false); } /** - * Check whether fieldset exists. + * Check whether fieldsets exists. * * @access public - * @param string $fieldset Fieldset + * @param string $id Fieldset id * @return bool True on success, false on failure. */ - public function has(string $fieldset) : bool + public function has(string $id) : bool { - return Filesystem::has($this->_file_location($fieldset)); + return Filesystem::has($this->_file_location($id)); } /** @@ -188,11 +187,11 @@ class Fieldsets * Helper method _file_location * * @access private - * @param string $name Name + * @param string $id Fieldsets id * @return string */ private function _file_location(string $name) : string { - return PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/fieldsets/' . $name . '.json'; + return PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/fieldsets/' . $id . '.json'; } } From a3aaee7405ac6f91b80a4fedd61afbe8eb543996 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 14:44:40 +0300 Subject: [PATCH 0794/1219] Slim Framework integration #118 #117 - Fieldsets: refactoring --- flextype/Fieldsets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Fieldsets.php b/flextype/Fieldsets.php index a750abff..ec60addc 100644 --- a/flextype/Fieldsets.php +++ b/flextype/Fieldsets.php @@ -190,7 +190,7 @@ class Fieldsets * @param string $id Fieldsets id * @return string */ - private function _file_location(string $name) : string + private function _file_location(string $id) : string { return PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/fieldsets/' . $id . '.json'; } From d70931b7aa30a4dbd15dfcfa11812704b7e77ca6 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 14:44:54 +0300 Subject: [PATCH 0795/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../app/Controllers/FieldsetsController.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index a293255c..4669358d 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -75,23 +75,25 @@ class FieldsetsController extends Controller public function edit($request, $response, $args) { - return $this->view->render($response, 'plugins/admin/views/templates/extends/fieldsets/edit.html', [ 'menu_item' => 'fieldsets', 'id' => $request->getQueryParams()['id'], + 'fieldsets_body' => $this->fieldsets->fetch($request->getQueryParams()['id']), 'links' => [ 'fieldsets' => [ - 'link' => $this->router->pathFor('admin.fieldsets.index'), + 'link' => $this->router->pathFor('admin.fieldsets.edit') . '?id=' . $request->getQueryParams()['id'], 'title' => __('admin_fieldsets'), 'attributes' => ['class' => 'navbar-item active'] ], - 'fieldsets_rename' => [ - 'link' => $this->router->pathFor('admin.fieldsets.rename') . '?id=' . $request->getQueryParams()['id'], - 'title' => __('admin_rename'), - 'attributes' => ['class' => 'navbar-item active'] - ], ], + 'buttons' => [ + 'save_entry' => [ + 'link' => 'javascript:;', + 'title' => __('admin_save'), + 'attributes' => ['class' => 'js-save-form-submit float-right btn'] + ], + ] ]); } From 14257a7a1f6fd926fb94a31c32affc098365f09a Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 15:11:24 +0300 Subject: [PATCH 0796/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../views/templates/extends/fieldsets/add.php | 47 --------------- .../templates/extends/fieldsets/edit.html | 23 +++++++ .../templates/extends/fieldsets/list.php | 60 ------------------- .../templates/extends/fieldsets/rename.php | 44 -------------- 4 files changed, 23 insertions(+), 151 deletions(-) delete mode 100644 site/plugins/admin/views/templates/extends/fieldsets/add.php create mode 100644 site/plugins/admin/views/templates/extends/fieldsets/edit.html delete mode 100644 site/plugins/admin/views/templates/extends/fieldsets/list.php delete mode 100644 site/plugins/admin/views/templates/extends/fieldsets/rename.php diff --git a/site/plugins/admin/views/templates/extends/fieldsets/add.php b/site/plugins/admin/views/templates/extends/fieldsets/add.php deleted file mode 100644 index 8496ae54..00000000 --- a/site/plugins/admin/views/templates/extends/fieldsets/add.php +++ /dev/null @@ -1,47 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'fieldsets' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets', - 'title' => __('admin_fieldsets'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'fieldsets_add' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets/add', - 'title' => __('admin_create_new_fieldset'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - -
- 'fieldsetTitle']) ?> - 'form-control', 'id' => 'fieldsetTitle', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
-
- 'fieldsetName']) ?> - 'form-control', 'id' => 'fieldsetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?> -
-
-
- 'btn btn-black']) ?> - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/fieldsets/edit.html b/site/plugins/admin/views/templates/extends/fieldsets/edit.html new file mode 100644 index 00000000..254a7387 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/fieldsets/edit.html @@ -0,0 +1,23 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} + +
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+{% endblock %} diff --git a/site/plugins/admin/views/templates/extends/fieldsets/list.php b/site/plugins/admin/views/templates/extends/fieldsets/list.php deleted file mode 100644 index 2eaa7a0c..00000000 --- a/site/plugins/admin/views/templates/extends/fieldsets/list.php +++ /dev/null @@ -1,60 +0,0 @@ - - - -display() ?> -assign('links', [ - 'fieldsets' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets', - 'title' => __('admin_fieldsets'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets/add', - 'title' => __('admin_create_new_fieldset'), - 'attributes' => ['class' => 'float-right btn'] - ] - ]) - ->display() -?> -display() ?> - - 0): ?> - - - - - - - - - $fieldset): ?> - - - - - - -
- - -
- - - -
- -
- - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/fieldsets/rename.php b/site/plugins/admin/views/templates/extends/fieldsets/rename.php deleted file mode 100644 index 4e08b771..00000000 --- a/site/plugins/admin/views/templates/extends/fieldsets/rename.php +++ /dev/null @@ -1,44 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'fieldsets' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets', - 'title' => __('admin_fieldsets'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'fieldsets_add' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets/rename?fieldset=' . $name_current, - 'title' => __('admin_rename'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - -
- 'fieldsetName']) ?> - 'form-control', 'id' => 'fieldsetName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_title_empty_input')]) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> From a0c0db3b878e7e193942c05c1f0bf5ab1eb08d08 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 15:11:43 +0300 Subject: [PATCH 0797/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/views/templates/content/entries/add.html | 3 +-- site/plugins/admin/views/templates/content/entries/move.html | 3 +-- site/plugins/admin/views/templates/content/entries/rename.html | 3 +-- site/plugins/admin/views/templates/content/entries/type.html | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/site/plugins/admin/views/templates/content/entries/add.html b/site/plugins/admin/views/templates/content/entries/add.html index 82d267b2..0dcffe67 100644 --- a/site/plugins/admin/views/templates/content/entries/add.html +++ b/site/plugins/admin/views/templates/content/entries/add.html @@ -2,8 +2,7 @@ {% block content %}
- - + {{ csrf() }}
diff --git a/site/plugins/admin/views/templates/content/entries/move.html b/site/plugins/admin/views/templates/content/entries/move.html index 5e811286..1780b9d9 100644 --- a/site/plugins/admin/views/templates/content/entries/move.html +++ b/site/plugins/admin/views/templates/content/entries/move.html @@ -4,8 +4,7 @@
- - + {{ csrf() }} diff --git a/site/plugins/admin/views/templates/content/entries/rename.html b/site/plugins/admin/views/templates/content/entries/rename.html index 081c16f8..4076d898 100644 --- a/site/plugins/admin/views/templates/content/entries/rename.html +++ b/site/plugins/admin/views/templates/content/entries/rename.html @@ -4,8 +4,7 @@
- - + {{ csrf() }} diff --git a/site/plugins/admin/views/templates/content/entries/type.html b/site/plugins/admin/views/templates/content/entries/type.html index 14cdf23f..f5c40d94 100644 --- a/site/plugins/admin/views/templates/content/entries/type.html +++ b/site/plugins/admin/views/templates/content/entries/type.html @@ -4,8 +4,7 @@
- - + {{ csrf() }}
From 6b143429e5917a937aaab8d41e7986ac7e8de116 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 15:12:02 +0300 Subject: [PATCH 0798/1219] Flextype Box Plugin: Admin #125 #117 - Settings Controller/Views implementation --- site/plugins/admin/views/templates/system/settings/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/plugins/admin/views/templates/system/settings/index.html b/site/plugins/admin/views/templates/system/settings/index.html index 8955888c..b736f03e 100644 --- a/site/plugins/admin/views/templates/system/settings/index.html +++ b/site/plugins/admin/views/templates/system/settings/index.html @@ -2,8 +2,7 @@ {% block content %} - - + {{ csrf() }}
From 36815b536e4eb1057cc2110cde4b62f3a1134d4e Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 15:20:34 +0300 Subject: [PATCH 0799/1219] Flextype Box Plugin: Admin #125 #117 - Plugins Controller/Views implementation --- site/plugins/admin/views/templates/extends/plugins/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/plugins/admin/views/templates/extends/plugins/index.html b/site/plugins/admin/views/templates/extends/plugins/index.html index 361836eb..041e0159 100644 --- a/site/plugins/admin/views/templates/extends/plugins/index.html +++ b/site/plugins/admin/views/templates/extends/plugins/index.html @@ -3,8 +3,7 @@ {% block content %} - - + {{ csrf() }} From 2a1746051a8639da5bca73434a845eddfd439d66 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 15:20:43 +0300 Subject: [PATCH 0800/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- .../templates/extends/fieldsets/edit.html | 15 ++---- .../templates/extends/fieldsets/edit.php | 49 ------------------- 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 site/plugins/admin/views/templates/extends/fieldsets/edit.php diff --git a/site/plugins/admin/views/templates/extends/fieldsets/edit.html b/site/plugins/admin/views/templates/extends/fieldsets/edit.html index 254a7387..a9874288 100644 --- a/site/plugins/admin/views/templates/extends/fieldsets/edit.html +++ b/site/plugins/admin/views/templates/extends/fieldsets/edit.html @@ -3,19 +3,12 @@ {% block content %}
{{ csrf() }} - + +
-
+
- - -
-
- - -
-
- +
diff --git a/site/plugins/admin/views/templates/extends/fieldsets/edit.php b/site/plugins/admin/views/templates/extends/fieldsets/edit.php deleted file mode 100644 index 5d112c30..00000000 --- a/site/plugins/admin/views/templates/extends/fieldsets/edit.php +++ /dev/null @@ -1,49 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'fieldset' => [ - 'link' => Http::getBaseUrl() . '/admin/fieldsets/edit?fieldset=' . Http::get('fieldset'), - 'title' => __('admin_fieldset'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- 'form']) ?> - - - -
-
-
- 'form-control', 'style' => 'min-height:500px;', 'id' => 'codeMirrorEditor']) ?> -
-
-
- -
-
- -display() ?> -display() ?> From 9fc04984d805ff5cc40ea3dab52134ebbe43eb48 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 15:20:51 +0300 Subject: [PATCH 0801/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- site/plugins/admin/app/Controllers/FieldsetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index 4669358d..918c2d1e 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -79,7 +79,7 @@ class FieldsetsController extends Controller 'plugins/admin/views/templates/extends/fieldsets/edit.html', [ 'menu_item' => 'fieldsets', 'id' => $request->getQueryParams()['id'], - 'fieldsets_body' => $this->fieldsets->fetch($request->getQueryParams()['id']), + 'data' => JsonParser::encode($this->fieldsets->fetch($request->getQueryParams()['id'])), 'links' => [ 'fieldsets' => [ 'link' => $this->router->pathFor('admin.fieldsets.edit') . '?id=' . $request->getQueryParams()['id'], From 5f0ff929283417cca289f92f437dd07af91e5a3b Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 21:37:37 +0300 Subject: [PATCH 0802/1219] Flextype Box Plugin: Admin #125 #117 - Users Controller/Views implementation --- .../admin/app/Controllers/UsersConstroller.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 site/plugins/admin/app/Controllers/UsersConstroller.php diff --git a/site/plugins/admin/app/Controllers/UsersConstroller.php b/site/plugins/admin/app/Controllers/UsersConstroller.php new file mode 100644 index 00000000..c39aba4e --- /dev/null +++ b/site/plugins/admin/app/Controllers/UsersConstroller.php @@ -0,0 +1,13 @@ + Date: Sat, 25 May 2019 21:37:51 +0300 Subject: [PATCH 0803/1219] Flextype Box Plugin: Admin #125 #117 - Fieldsets Controller/Views implementation --- site/plugins/admin/app/Controllers/FieldsetsController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index 918c2d1e..6549b9a4 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -99,7 +99,13 @@ class FieldsetsController extends Controller public function editProcess($request, $response, $args) { + if ($this->fieldsets->update($request->getParsedBody()['id'], JsonParser::decode($request->getParsedBody()['data']))) { + $this->flash->addMessage('success', __('admin_message_fieldsets_saved')); + } else { + $this->flash->addMessage('error', __('admin_message_fieldsets_was_not_saved')); + } + return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); } public function rename($request, $response, $args) @@ -132,7 +138,6 @@ class FieldsetsController extends Controller } return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); - } public function deleteProcess($request, $response, $args) From 7127346e5fa17108c56a6d604a214ef2ff2f3ac8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 23:49:33 +0300 Subject: [PATCH 0804/1219] Flextype Box Plugin: Admin #125 #117 - Plugins Controller/Views implementation --- site/plugins/admin/app/Controllers/PluginsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/PluginsController.php b/site/plugins/admin/app/Controllers/PluginsController.php index d59f3c95..5b2b55f8 100644 --- a/site/plugins/admin/app/Controllers/PluginsController.php +++ b/site/plugins/admin/app/Controllers/PluginsController.php @@ -33,7 +33,7 @@ class PluginsController extends Controller ]); } - public function changeStatus($request, $response, $args) + public function pluginStatusProcess($request, $response, $args) { $data = $request->getParsedBody(); $plugin_settings = JsonParser::decode(Filesystem::read(PATH['plugins'] . '/' . $data['plugin'] . '/' . 'settings.json')); From c39660af230f3bb7818ae88917815cb4403106cf Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 25 May 2019 23:49:39 +0300 Subject: [PATCH 0805/1219] Flextype Box Plugin: Admin #125 #117 - Plugins Controller/Views implementation --- site/plugins/admin/views/templates/extends/plugins/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/plugins/index.html b/site/plugins/admin/views/templates/extends/plugins/index.html index 041e0159..e6bd9583 100644 --- a/site/plugins/admin/views/templates/extends/plugins/index.html +++ b/site/plugins/admin/views/templates/extends/plugins/index.html @@ -2,7 +2,7 @@ {% block content %} - + {{ csrf() }}
From ad9a402e3d58912a121ff9742eb903469e2e6cb3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 26 May 2019 00:33:21 +0300 Subject: [PATCH 0806/1219] Slim Framework integration #118 #117 - Themes: refactoring --- flextype/Themes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Themes.php b/flextype/Themes.php index 3f962bce..19a641a9 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -71,7 +71,7 @@ class Themes $partials = []; // Get partials files - $_partials = Filesystem::listContents(PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/views/partials/'); + $_partials = Filesystem::listContents(PATH['themes'] . '/' . $this->flextype['registry']->get('settings.theme') . '/templates/partials/'); // If there is any partials file then go... if (count($_partials) > 0) { From 9723470fac14c0a1e0f7fe1919987f40792cf885 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 26 May 2019 00:33:39 +0300 Subject: [PATCH 0807/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../app/Controllers/TemplatesController.php | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index 00648363..f6eefcc6 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -8,7 +8,26 @@ class TemplatesController extends Controller { public function index($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/templates/index.html', [ + 'menu_item' => 'templates', + 'templates_list' => $this->themes->getTemplates(), + 'partials_list' => $this->themes->getPartials(), + 'links' => [ + 'templates' => [ + 'link' => $this->router->pathFor('admin.templates.index'), + 'title' => __('admin_templates'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + 'buttons' => [ + 'templates_create' => [ + 'link' => $this->router->pathFor('admin.templates.add'), + 'title' => __('admin_create_new_template'), + 'attributes' => ['class' => 'float-right btn'] + ], + ] + ]); } public function add($request, $response, $args) From 0cd62a82cf6bd04680dbf9baa91dc820bbc59b4d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 26 May 2019 12:49:09 +0300 Subject: [PATCH 0808/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../views/templates/extends/templates/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 site/plugins/admin/views/templates/extends/templates/index.html diff --git a/site/plugins/admin/views/templates/extends/templates/index.html b/site/plugins/admin/views/templates/extends/templates/index.html new file mode 100644 index 00000000..ce70daee --- /dev/null +++ b/site/plugins/admin/views/templates/extends/templates/index.html @@ -0,0 +1,15 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +{% if (templates_list|length > 0) or (partials_list|length > 0) %} + + {% if templates_list|length > 0 %} +1 + {% endif %} + + {% if partials_list|length > 0 %} +2 + {% endif %} + +{% endif %} +{% endblock %} From 20e5c60fb43947be945fdd8ae299b00e44c104eb Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 27 May 2019 00:11:35 +0300 Subject: [PATCH 0809/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../templates/extends/templates/index.html | 49 +++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/site/plugins/admin/views/templates/extends/templates/index.html b/site/plugins/admin/views/templates/extends/templates/index.html index ce70daee..c03188c0 100644 --- a/site/plugins/admin/views/templates/extends/templates/index.html +++ b/site/plugins/admin/views/templates/extends/templates/index.html @@ -2,14 +2,55 @@ {% block content %} {% if (templates_list|length > 0) or (partials_list|length > 0) %} - +
+ + + + + + + + {% if templates_list|length > 0 %} -1 + {% for template in templates_list %} + + + + + + {% endfor %} {% endif %} {% if partials_list|length > 0 %} -2 - {% endif %} + {% endif %} + +
{{ tr('admin_name') }}{{ tr('admin_type') }}
+ {{ template }} + {{ tr('admin_template') }} +
+ {{ tr('admin_edit') }} + + +
+ + + {{ tr('admin_delete') }} +
{% endif %} {% endblock %} From 5d36b2329eee0905c7feab87b0c3ba3a1438e46f Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 27 May 2019 09:42:59 +0300 Subject: [PATCH 0810/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../admin/views/templates/extends/templates/index.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/site/plugins/admin/views/templates/extends/templates/index.html b/site/plugins/admin/views/templates/extends/templates/index.html index c03188c0..ea4164ae 100644 --- a/site/plugins/admin/views/templates/extends/templates/index.html +++ b/site/plugins/admin/views/templates/extends/templates/index.html @@ -12,20 +12,20 @@ {% if templates_list|length > 0 %} - {% for template in templates_list %} + {% for id in templates_list %} - {{ template }} + {{ id }} {{ tr('admin_template') }}
- {{ tr('admin_edit') }} + {{ tr('admin_edit') }} {{ id }} + + {{ tr('admin_partial') }} + + + + + {{ tr('admin_delete') }} + + + {% endfor %} {% endif %} From e07fabc59564f52c3f139cc2faed6f5fe0276b3a Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 10:50:38 +0300 Subject: [PATCH 0814/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../app/Controllers/TemplatesController.php | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index 806c2e27..7b7df183 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -63,18 +63,42 @@ class TemplatesController extends Controller public function deleteProcess($request, $response, $args) { + $type = $request->getParsedBody()['type']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + $template_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; + + if (Filesystem::delete($template_path)) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_deleted')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_deleted')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); } public function duplicateProcess($request, $response, $args) { - $template_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . '/templates/' . $request->getParsedBody()['template-id'] . '.html'; - $template_path_new = PATH['themes'] . '/' . $this->registry->get('settings.theme') . '/templates/' . $request->getParsedBody()['template-id'] . '-duplicate-' . date("Ymd_His") . '.html'; + $type = $request->getParsedBody()['type']; + + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + $template_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; + $template_path_new = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '-duplicate-' . date("Ymd_His") . '.html'; if (Filesystem::copy($template_path, $template_path_new)) { - $this->flash->addMessage('success', __('admin_message_templates_duplicated')); + $this->flash->addMessage('success', __('admin_message_'.$type.'_duplicated')); } else { - $this->flash->addMessage('error', __('admin_message_templates_was_not_duplicated')); + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_duplicated')); } return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); From 4011f8ffadd2a411316eb6fa82241e1ebfc92af1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 12:44:10 +0300 Subject: [PATCH 0815/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../app/Controllers/TemplatesController.php | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index 7b7df183..5018d0e5 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -3,6 +3,7 @@ namespace Flextype; use Flextype\Component\Filesystem\Filesystem; +use Flextype\Component\Text\Text; use function Flextype\Component\I18n\__; class TemplatesController extends Controller @@ -33,12 +34,47 @@ class TemplatesController extends Controller public function add($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/templates/add.html', [ + 'menu_item' => 'templates', + 'links' => [ + 'templates' => [ + 'link' => $this->router->pathFor('admin.templates.index'), + 'title' => __('admin_templates'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ] + ]); } public function addProcess($request, $response, $args) { + $type = $request->getParsedBody()['type']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + $id = Text::safeString($request->getParsedBody()['id'], '-', true) . '.html'; + + $file = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $id; + + if (!Filesystem::has($file)) { + if (Filesystem::write( + $file, + "" + )) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_created')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_created')); + } + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_created')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); } public function edit($request, $response, $args) @@ -71,9 +107,9 @@ class TemplatesController extends Controller $_type = '/templates/'; } - $template_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; + $file_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; - if (Filesystem::delete($template_path)) { + if (Filesystem::delete($file_path)) { $this->flash->addMessage('success', __('admin_message_'.$type.'_deleted')); } else { $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_deleted')); @@ -92,10 +128,10 @@ class TemplatesController extends Controller $_type = '/templates/'; } - $template_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; - $template_path_new = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '-duplicate-' . date("Ymd_His") . '.html'; + $file_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; + $file_path_new = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '-duplicate-' . date("Ymd_His") . '.html'; - if (Filesystem::copy($template_path, $template_path_new)) { + if (Filesystem::copy($file_path, $file_path_new)) { $this->flash->addMessage('success', __('admin_message_'.$type.'_duplicated')); } else { $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_duplicated')); From cd03c6f0b2b93b9a0289d53d90fb222722edc2d8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 12:44:15 +0300 Subject: [PATCH 0816/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../templates/extends/templates/add.html | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 site/plugins/admin/views/templates/extends/templates/add.html diff --git a/site/plugins/admin/views/templates/extends/templates/add.html b/site/plugins/admin/views/templates/extends/templates/add.html new file mode 100644 index 00000000..db51d0e8 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/templates/add.html @@ -0,0 +1,25 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} +
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+{% endblock %} From 06e641a375a3bf6bc1e4819aef89e7b29f93a77d Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 17:56:58 +0300 Subject: [PATCH 0817/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../templates/extends/templates/rename.html | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 site/plugins/admin/views/templates/extends/templates/rename.html diff --git a/site/plugins/admin/views/templates/extends/templates/rename.html b/site/plugins/admin/views/templates/extends/templates/rename.html new file mode 100644 index 00000000..66868b84 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/templates/rename.html @@ -0,0 +1,20 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} + + +
+
+
+ + +
+
+ +
+
+
+
+{% endblock %} From 1064a94147b1d07b81d13262aa84b4bd309f3977 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 17:57:07 +0300 Subject: [PATCH 0818/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../app/Controllers/TemplatesController.php | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index 5018d0e5..e6ac3188 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -89,12 +89,46 @@ class TemplatesController extends Controller public function rename($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/templates/rename.html', [ + 'menu_item' => 'templates', + 'types' => ['partial' => __('admin_partial'), 'template' => __('admin_template')], + 'id_current' => $request->getQueryParams()['id'], + 'type_current' => (($request->getQueryParams()['type'] && $request->getQueryParams()['type'] == 'partial') ? 'partial' : 'template'), + 'links' => [ + 'templates' => [ + 'link' => $this->router->pathFor('admin.templates.index'), + 'title' => __('admin_templates'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ] + ]); } public function renameProcess($request, $response, $args) { + $type = $request->getParsedBody()['type_current']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + if (!Filesystem::has(PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html')) { + if (Filesystem::rename( + PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id_current'] . '.html', + PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html') + ) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_renamed')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_renamed')); + } + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_renamed')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); } public function deleteProcess($request, $response, $args) From 4c5dc87cceae5a7ac0af95f1ac92900a2b2d2245 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 18:49:34 +0300 Subject: [PATCH 0819/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../app/Controllers/TemplatesController.php | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index e6ac3188..755f3d37 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -79,7 +79,34 @@ class TemplatesController extends Controller public function edit($request, $response, $args) { + $type = $request->getQueryParams()['type']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + return $this->view->render($response, + 'plugins/admin/views/templates/extends/templates/edit.html', [ + 'menu_item' => 'templates', + 'data' => Filesystem::read(PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getQueryParams()['id'] . '.html'), + 'type' => (($request->getQueryParams()['type'] && $request->getQueryParams()['type'] == 'partial') ? 'partial' : 'template'), + 'links' => [ + 'templates' => [ + 'link' => $this->router->pathFor('admin.templates.index'), + 'title' => __('admin_templates'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + 'buttons' => [ + 'save_template' => [ + 'link' => 'javascript:;', + 'title' => __('admin_save'), + 'attributes' => ['class' => 'js-save-form-submit float-right btn'] + ] + ] + ]); } public function editProcess($request, $response, $args) From 5ab32590b603447ac9cf805e2ccb72e5616c2a1a Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 18:49:40 +0300 Subject: [PATCH 0820/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../views/templates/extends/templates/edit.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 site/plugins/admin/views/templates/extends/templates/edit.html diff --git a/site/plugins/admin/views/templates/extends/templates/edit.html b/site/plugins/admin/views/templates/extends/templates/edit.html new file mode 100644 index 00000000..c52ff383 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/templates/edit.html @@ -0,0 +1,17 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} + + + +
+
+
+ +
+
+
+
+{% endblock %} From dceac6700f543b736f72bc7a7d0c0c8781041379 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 22:40:07 +0300 Subject: [PATCH 0821/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../views/templates/extends/templates/add.php | 47 ---------- .../templates/extends/templates/edit.php | 50 ----------- .../templates/extends/templates/list.php | 87 ------------------- .../templates/extends/templates/rename.php | 49 ----------- 4 files changed, 233 deletions(-) delete mode 100644 site/plugins/admin/views/templates/extends/templates/add.php delete mode 100644 site/plugins/admin/views/templates/extends/templates/edit.php delete mode 100644 site/plugins/admin/views/templates/extends/templates/list.php delete mode 100644 site/plugins/admin/views/templates/extends/templates/rename.php diff --git a/site/plugins/admin/views/templates/extends/templates/add.php b/site/plugins/admin/views/templates/extends/templates/add.php deleted file mode 100644 index 6a7e641a..00000000 --- a/site/plugins/admin/views/templates/extends/templates/add.php +++ /dev/null @@ -1,47 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'templates' => [ - 'link' => Http::getBaseUrl() . '/admin/templates', - 'title' => __('admin_templates'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'templates_add' => [ - 'link' => Http::getBaseUrl() . '/admin/templates/add', - 'title' => __('admin_create_new_template'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - -
- 'templateName']) ?> - 'form-control', 'id' => 'templateName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_error_name_empty_input')]) ?> -
-
- 'templateType']) ?> - __('admin_template'), 'partial' => __('admin_partial')], 'template', ['class' => 'form-control', 'id' => 'templateType']) ?> -
-
-
- 'btn btn-black']) ?> - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/templates/edit.php b/site/plugins/admin/views/templates/extends/templates/edit.php deleted file mode 100644 index f4e2ac89..00000000 --- a/site/plugins/admin/views/templates/extends/templates/edit.php +++ /dev/null @@ -1,50 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'template' => [ - 'link' => Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::get('template') . '&type=' . $type, - 'title' => __('admin_template'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'save_entry' => [ - 'link' => 'javascript:;', - 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit float-right btn'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- 'form']) ?> - - - - -
-
-
- 'form-control', 'style' => 'min-height:500px;', 'id' => 'codeMirrorEditor']) ?> -
-
-
- -
-
- -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/templates/list.php b/site/plugins/admin/views/templates/extends/templates/list.php deleted file mode 100644 index 0552d1c2..00000000 --- a/site/plugins/admin/views/templates/extends/templates/list.php +++ /dev/null @@ -1,87 +0,0 @@ - - - -display() ?> -assign('links', [ - 'templates' => [ - 'link' => Http::getBaseUrl() . '/admin/templates', - 'title' => __('admin_templates'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->assign('buttons', [ - 'entries' => [ - 'link' => Http::getBaseUrl() . '/admin/templates/add', - 'title' => __('admin_create_new_template'), - 'attributes' => ['class' => 'float-right btn'] - ] - ]) - ->display() -?> -display() ?> - - 0 || count($partials_list) > 0): ?> - - - - - - - - - - 0): ?> - - - - - - - - - 0): ?> - - - - - - - - - -
- - -
- - - -
- -
- - -
- - - -
- -
- - - - -display() ?> -display() ?> diff --git a/site/plugins/admin/views/templates/extends/templates/rename.php b/site/plugins/admin/views/templates/extends/templates/rename.php deleted file mode 100644 index 4b8a0d24..00000000 --- a/site/plugins/admin/views/templates/extends/templates/rename.php +++ /dev/null @@ -1,49 +0,0 @@ -display(); -Themes::view('admin/views/partials/navbar') - ->assign('links', [ - 'templates' => [ - 'link' => Http::getBaseUrl() . '/admin/templates', - 'title' => __('admin_templates'), - 'attributes' => ['class' => 'navbar-item'] - ], - 'templates_add' => [ - 'link' => Http::getBaseUrl() . '/admin/templates/rename?template=' . $name_current, - 'title' => __('admin_rename'), - 'attributes' => ['class' => 'navbar-item active'] - ] - ]) - ->display(); -Themes::view('admin/views/partials/content-start')->display(); -?> - -
-
- - - - -
- 'templateName']) ?> - 'form-control', 'id' => 'templateName', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_template_error_title_empty_input')]) ?> -
-
- 'templateType']) ?> - __('admin_template'), 'partial' => __('admin_partial')], $type, ['class' => 'form-control', 'id' => 'templateType']) ?> -
- 'btn btn-black btn-fill btn-wd']) ?> - -
-
- -display() ?> -display() ?> From 160b767dc4b836d0be8e824afaf74693c49be328 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 23:38:25 +0300 Subject: [PATCH 0822/1219] Flextype Box Plugin: Admin #125 #117 - Templates Controller/Views implementation --- .../admin/app/Controllers/TemplatesController.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index 755f3d37..4e0557e6 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -111,7 +111,21 @@ class TemplatesController extends Controller public function editProcess($request, $response, $args) { + $type = $request->getParsedBody()['type_current']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + if (Filesystem::write( PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html', $request->getParsedBody()['data'])) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_saved')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_saved')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index')); } public function rename($request, $response, $args) From 8b7d7a3fdb0fce68973f48150e05113053f318a8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 28 May 2019 23:45:40 +0300 Subject: [PATCH 0823/1219] Slim Framework integration #118 #117 - Entries: refactoring --- flextype/Entries.php | 73 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index b68dfc6d..df157a82 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -36,13 +36,12 @@ class Entries * Fetch entry * * @access public - * @param string $entry Entry + * @param string $id Entry id * @return array|false The entry contents or false on failure. */ - public function fetch(string $entry) + public function fetch(string $id) { - - $entry_file = Entries::_file_location($entry); + $entry_file = Entries::_file_location($id); if (Filesystem::has($entry_file)) { @@ -68,7 +67,7 @@ class Entries // Create default entry items $entry_decoded['date'] = $entry_decoded['date'] ?? date($this->flextype['registry']->get('settings.date_format'), Filesystem::getTimestamp($entry_file)); - $entry_decoded['slug'] = $entry_decoded['slug'] ?? ltrim(rtrim($entry, '/'), '/'); + $entry_decoded['slug'] = $entry_decoded['slug'] ?? ltrim(rtrim($id, '/'), '/'); // Save to cache $this->flextype['cache']->save($cache_id, $entry_decoded); @@ -96,14 +95,14 @@ class Entries * Fetch entries * * @access public - * @param string $entry Entry + * @param string $id Entry id * @param string $order_by Order by specific entry field. * @param string $order_type Order type: DESC or ASC * @param int $offset Offset * @param int $length Length * @return array The entries */ - public function fetchAll(string $entry, string $order_by = 'date', string $order_type = 'DESC', int $offset = null, int $length = null) : array + public function fetchAll(string $id, string $order_by = 'date', string $order_type = 'DESC', int $offset = null, int $length = null) : array { // Entries array where founded entries will stored $entries = []; @@ -112,14 +111,14 @@ class Entries $cache_id = ''; // Entries path - $entries_path = $this->_dir_location($entry); + $entries_path = $this->_dir_location($id); // Get entries list $entries_list = Filesystem::listContents($entries_path); // Create entries cached id foreach ($entries_list as $current_entry) { - if (strpos($current_entry['path'], $entry . '/entry.json') !== false) { + if (strpos($current_entry['path'], $id . '/entry.json') !== false) { // ignore ... } else { if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.json')) { @@ -134,11 +133,11 @@ class Entries // Create entries array from entries list and ignore current requested entry foreach ($entries_list as $current_entry) { - if (strpos($current_entry['path'], $entry . '/entry.json') !== false) { + if (strpos($current_entry['path'], $id . '/entry.json') !== false) { // ignore ... } else { if ($current_entry['type'] == 'dir' && Filesystem::has($current_entry['path'] . '/entry.json')) { - $entries[$current_entry['dirname']] = $this->fetch($entry . '/' . $current_entry['dirname']); + $entries[$current_entry['dirname']] = $this->fetch($id . '/' . $current_entry['dirname']); } } } @@ -163,26 +162,26 @@ class Entries * Rename entry. * * @access public - * @param string $entry Entry - * @param string $new_entry New entry + * @param string $id Entry id + * @param string $new_id New entry id * @return bool True on success, false on failure. */ - public function rename(string $entry, string $new_entry) : bool + public function rename(string $id, string $new_id) : bool { - return rename($this->_dir_location($entry), $this->_dir_location($new_entry)); + return rename($this->_dir_location($id), $this->_dir_location($new_id)); } /** * Update entry * * @access public - * @param string $entry Entry + * @param string $id Entry * @param array $data Data * @return bool */ - public function update(string $entry, array $data) : bool + public function update(string $id, array $data) : bool { - $entry_file = $this->_file_location($entry); + $entry_file = $this->_file_location($id); if (Filesystem::has($entry_file)) { return Filesystem::write($entry_file, JsonParser::encode($data)); @@ -195,13 +194,13 @@ class Entries * Create entry * * @access public - * @param string $entry Entry + * @param string $id Entry id * @param array $data Data * @return bool */ - public function create(string $entry, array $data) : bool + public function create(string $id, array $data) : bool { - $entry_dir = $this->_dir_location($entry); + $entry_dir = $this->_dir_location($id); // Check if new entry directory exists if (!Filesystem::has($entry_dir)) { @@ -229,61 +228,61 @@ class Entries * Delete entry. * * @access public - * @param string $entry Entry + * @param string $id Entry id * @return bool True on success, false on failure. */ - public function delete(string $entry) : bool + public function delete(string $id) : bool { - return Filesystem::deleteDir($this->_dir_location($entry)); + return Filesystem::deleteDir($this->_dir_location($id)); } /** * Copy entry(s) * * @access public - * @param string $entry Entry - * @param string $new_entry New entry + * @param string $id Entry id + * @param string $new_id New entry id * @param bool $recursive Recursive copy entries. * @return bool True on success, false on failure. */ - public function copy(string $entry, string $new_entry, bool $recursive = false) + public function copy(string $id, string $new_id, bool $recursive = false) { - return Filesystem::copy($this->_dir_location($entry), $this->_dir_location($new_entry), $recursive); + return Filesystem::copy($this->_dir_location($id), $this->_dir_location($new_id), $recursive); } /** * Check whether entry exists. * * @access public - * @param string $entry Entry + * @param string $id Entry * @return bool */ - public function has(string $entry) : bool + public function has(string $id) : bool { - return Filesystem::has($this->_file_location($entry)); + return Filesystem::has($this->_file_location($id)); } /** * Helper method _file_location * * @access private - * @param string $name Name + * @param string $id Entry id * @return string */ - private function _file_location(string $name) : string + private function _file_location(string $id) : string { - return PATH['entries'] . '/' . $name . '/entry.json'; + return PATH['entries'] . '/' . $id . '/entry.json'; } /** * Helper method _dir_location * * @access private - * @param string $name Name + * @param string $id Entry id * @return string */ - private function _dir_location(string $name) : string + private function _dir_location(string $id) : string { - return PATH['entries'] . '/' . $name; + return PATH['entries'] . '/' . $id; } } From 9015a10ea7f277935cd7e449de509ed09ebb9ae9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 00:17:12 +0300 Subject: [PATCH 0824/1219] Slim Framework integration #118 #117 - Snippets: refactoring --- flextype/Snippets.php | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index a12b730d..6d1f5c06 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -35,15 +35,15 @@ class Snippets * Get snippet * * @access public - * @param string $snippet_name Snippet name + * @param string $id Snippet id * @return string|bool Returns the contents of the output buffer and end output buffering. * If output buffering isn't active then FALSE is returned. */ - public function fetch(string $snippet) + public function display(string $id) { $vars = []; - $vars['fetch'] = $snippet; + $vars['fetch'] = $id; return $this->_fetch_snippet($vars); } @@ -52,24 +52,24 @@ class Snippets * Rename snippet. * * @access public - * @param string $snippet Snippet - * @param string $new_snippet New snippet + * @param string $id Snippet id + * @param string $new_id New snippet id * @return bool True on success, false on failure. */ - public function rename(string $snippet, string $new_snippet) : bool + public function rename(string $id, string $new_id) : bool { - return rename($this->_file_location($snippet), $this->_file_location($new_snippet)); + return rename($this->_file_location($id), $this->_file_location($new_id)); } /** * Update Snippet * * @access public - * @param string $snippet Snippet - * @param string $data Data + * @param string $id Snippet id + * @param string $data Data * @return bool True on success, false on failure. */ - public function update(string $snippet, string $data) : bool + public function update(string $id, string $data) : bool { $snippet_file = $this->_file_location($snippet); @@ -84,13 +84,13 @@ class Snippets * Create snippet * * @access public - * @param string $snippet Snippet - * @param string $data Data + * @param string $id Snippet id + * @param string $data Data * @return bool True on success, false on failure. */ - public function create(string $snippet, string $data = '') : bool + public function create(string $id, string $data = '') : bool { - $snippet_file = $this->_file_location($snippet); + $snippet_file = $this->_file_location($id); // Check if new entry file exists if (!Filesystem::has($snippet_file)) { @@ -104,54 +104,54 @@ class Snippets * Delete snippet. * * @access public - * @param string $snippet Snippet + * @param string $id Snippet id * @return bool True on success, false on failure. */ - public function delete(string $snippet) : bool + public function delete(string $id) : bool { - return Filesystem::delete($this->_file_location($snippet)); + return Filesystem::delete($this->_file_location($id)); } /** * Copy snippet * * @access public - * @param string $snippet Snippet - * @param string $new_snippet New snippet + * @param string $id Snippet id + * @param string $new_id New snippet id * @return bool True on success, false on failure. */ - public function copy(string $snippet, string $new_snippet) : bool + public function copy(string $id, string $new_id) : bool { - return Filesystem::copy($this->_file_location($snippet), $this->_file_location($new_snippet), false); + return Filesystem::copy($this->_file_location($id), $this->_file_location($new_id), false); } /** * Check whether snippet exists. * * @access public - * @param string $snippet Snippet + * @param string $id Snippet id * @return bool True on success, false on failure. */ - public function has(string $snippet) : bool + public function has(string $id) : bool { - return Filesystem::has($this->_file_location($snippet)); + return Filesystem::has($this->_file_location($id)); } /** - * Helper private method _fetch_snippet + * Helper private method _display_snippet * * @access private * @param array $vars Vars * @return string|bool Returns the contents of the output buffer and end output buffering. * If output buffering isn't active then FALSE is returned. */ - private function _fetch_snippet(array $vars) { + private function _display_snippet(array $vars) { // Extracst attributes extract($vars); // Get snippet name - $name = (isset($fetch)) ? (string) $fetch : ''; + $name = (isset($id)) ? (string) $id : ''; // Define snippet path $snippet_file = $this->_file_location($name); @@ -176,11 +176,11 @@ class Snippets * Helper method _file_location * * @access private - * @param string $name Name + * @param string $id Snippet id * @return string */ - private function _file_location(string $name) : string + private function _file_location(string $id) : string { - return PATH['snippets'] . '/' . $name . '.php'; + return PATH['snippets'] . '/' . $id . '.php'; } } From b8f04df7af6fb97d1117d5a6a803c3d49061925e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 00:27:34 +0300 Subject: [PATCH 0825/1219] Slim Framework integration #118 #117 - Snippets: refactoring --- flextype/Snippets.php | 51 ++++++++++++++++++++++- flextype/shortcodes/SnippetsShortcode.php | 4 +- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 6d1f5c06..d44df4d8 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -45,7 +45,56 @@ class Snippets $vars['fetch'] = $id; - return $this->_fetch_snippet($vars); + return $this->_display_snippet($vars); + } + + /** + * Fetch snippet + * + * @access public + * @param string $id Snippet id + * @return array|false The entry contents or false on failure. + */ + public function fetch(string $id) + { + $snippet_file = Fieldsets::_file_location($id); + + if (Filesystem::has($snippet_file)) { + if ($snippet_body = Filesystem::read($snippet_file)) { + return $snippet_body; + } else { + return false; + } + } else { + return false; + } + } + + /** + * Fetch Snippets + * + * @access public + * @return array + */ + public function fetchList() : array + { + $snippets = []; + + // Get snippets files + $_snippets = Filesystem::listContents($this->_dir_location()); + + // If there is any snippets file then go... + if (count($_snippets) > 0) { + foreach ($_snippets as $snippet) { + if ($snippet['type'] == 'file' && $snippet['extension'] == 'json') { + $snippet_content = JsonParser::decode(Filesystem::read($snippet['path'])); + $snippet[$snippet['basename']] = $snippet_content['title']; + } + } + } + + // return snippets + return $snippets; } /** diff --git a/flextype/shortcodes/SnippetsShortcode.php b/flextype/shortcodes/SnippetsShortcode.php index c3d065e3..e866d04a 100644 --- a/flextype/shortcodes/SnippetsShortcode.php +++ b/flextype/shortcodes/SnippetsShortcode.php @@ -15,7 +15,7 @@ namespace Flextype; use Thunder\Shortcode\ShortcodeFacade; use Thunder\Shortcode\Shortcode\ShortcodeInterface; -// Shortcode: [snippets fetch=snippet-name] +// Shortcode: [snippets id=snippet-name] $flextype['shortcodes']->addHandler('snippets', function(ShortcodeInterface $s) use ($flextype) { - return $flextype['shortcodes']->fetch($s->getParameter('fetch')); + return $flextype['shortcodes']->display($s->getParameter('id')); }); From e8ff6c9532a3b024c0b15caadd8490e99a831690 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 00:37:24 +0300 Subject: [PATCH 0826/1219] Slim Framework integration #118 #117 - Snippets: refactoring --- flextype/Snippets.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index d44df4d8..ec362a7a 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -86,9 +86,8 @@ class Snippets // If there is any snippets file then go... if (count($_snippets) > 0) { foreach ($_snippets as $snippet) { - if ($snippet['type'] == 'file' && $snippet['extension'] == 'json') { - $snippet_content = JsonParser::decode(Filesystem::read($snippet['path'])); - $snippet[$snippet['basename']] = $snippet_content['title']; + if ($snippet['type'] == 'file' && $snippet['extension'] == 'php') { + $snippet[$snippet['basename']] = $snippet['basename']; } } } @@ -232,4 +231,15 @@ class Snippets { return PATH['snippets'] . '/' . $id . '.php'; } + + /** + * Helper method _dir_location + * + * @access private + * @return string + */ + private function _dir_location() : string + { + return PATH['snippets'] . '/'; + } } From 4aad48bd7d2441aa628b0221b613040961ed2d96 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 00:52:03 +0300 Subject: [PATCH 0827/1219] Slim Framework integration #118 #117 - Snippets: refactoring --- flextype/Snippets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index ec362a7a..3b3f70f1 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -87,7 +87,7 @@ class Snippets if (count($_snippets) > 0) { foreach ($_snippets as $snippet) { if ($snippet['type'] == 'file' && $snippet['extension'] == 'php') { - $snippet[$snippet['basename']] = $snippet['basename']; + $snippets[$snippet['basename']] = $snippet['basename']; } } } From 840cdd8c8cb6ffa4079bd4e3fdf29c1ad9c47e06 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:00:08 +0300 Subject: [PATCH 0828/1219] Flextype Box Plugin: Admin #125 #117 - Snippets Controller/Views implementation --- .../app/Controllers/SnippetsController.php | 135 +++++++++++++++++- 1 file changed, 131 insertions(+), 4 deletions(-) diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php index c158cc96..d8df62cf 100644 --- a/site/plugins/admin/app/Controllers/SnippetsController.php +++ b/site/plugins/admin/app/Controllers/SnippetsController.php @@ -2,52 +2,179 @@ namespace Flextype; +use Flextype\Component\Filesystem\Filesystem; +use Flextype\Component\Text\Text; use function Flextype\Component\I18n\__; class SnippetsController extends Controller { public function index($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/snippets/index.html', [ + 'menu_item' => 'snippets', + 'snippets_list' => $this->snippets->fetchList(), + 'links' => [ + 'snippets' => [ + 'link' => $this->router->pathFor('admin.snippets.index'), + 'title' => __('admin_snippets'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + 'buttons' => [ + 'snippets_create' => [ + 'link' => $this->router->pathFor('admin.snippets.add'), + 'title' => __('admin_create_new_snippet'), + 'attributes' => ['class' => 'float-right btn'] + ], + ] + ]); } public function add($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/snippets/add.html', [ + 'menu_item' => 'snippets', + 'links' => [ + 'snippets' => [ + 'link' => $this->router->pathFor('admin.snippets.index'), + 'title' => __('admin_snippets'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ] + ]); } public function addProcess($request, $response, $args) { + if ($this->snippets->create($request->getParsedBody()['id'], "")) { + $this->flash->addMessage('success', __('admin_message_snippet_created')); + } else { + $this->flash->addMessage('error', __('admin_message_snippet_was_not_created')); + } + return $response->withRedirect($this->container->get('router')->pathFor('admin.snippets.index')); } public function edit($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/snippets/edit.html', [ + 'menu_item' => 'snippets', + 'data' => $this->snippets->fetch($request->getQueryParams()['id']), + 'links' => [ + 'snippets' => [ + 'link' => $this->router->pathFor('admin.snippets.index'), + 'title' => __('admin_snippets'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ], + 'buttons' => [ + 'save_snippet' => [ + 'link' => 'javascript:;', + 'title' => __('admin_save'), + 'attributes' => ['class' => 'js-save-form-submit float-right btn'] + ] + ] + ]); } public function editProcess($request, $response, $args) { + if ($this->snippets->update($request->getParsedBody()['id']), $request->getParsedBody()['data'])) { + $this->flash->addMessage('success', __('admin_message_snippets_saved')); + } else { + $this->flash->addMessage('error', __('admin_message_snippets_was_not_saved')); + } + return $response->withRedirect($this->container->get('router')->pathFor('admin.snippets.index')); } public function rename($request, $response, $args) { - + return $this->view->render($response, + 'plugins/admin/views/templates/extends/templates/rename.html', [ + 'menu_item' => 'templates', + 'types' => ['partial' => __('admin_partial'), 'template' => __('admin_template')], + 'id_current' => $request->getQueryParams()['id'], + 'type_current' => (($request->getQueryParams()['type'] && $request->getQueryParams()['type'] == 'partial') ? 'partial' : 'template'), + 'links' => [ + 'templates' => [ + 'link' => $this->router->pathFor('admin.templates.index'), + 'title' => __('admin_templates'), + 'attributes' => ['class' => 'navbar-item active'] + ], + ] + ]); } public function renameProcess($request, $response, $args) { + $type = $request->getParsedBody()['type_current']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + if (!Filesystem::has(PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html')) { + if (Filesystem::rename( + PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id_current'] . '.html', + PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html') + ) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_renamed')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_renamed')); + } + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_renamed')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); } public function deleteProcess($request, $response, $args) { + $type = $request->getParsedBody()['type']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + $file_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; + + if (Filesystem::delete($file_path)) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_deleted')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_deleted')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); } public function duplicateProcess($request, $response, $args) { + $type = $request->getParsedBody()['type']; + if ($type == 'partial') { + $_type = '/templates/partials/'; + } else { + $_type = '/templates/'; + } + + $file_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; + $file_path_new = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '-duplicate-' . date("Ymd_His") . '.html'; + + if (Filesystem::copy($file_path, $file_path_new)) { + $this->flash->addMessage('success', __('admin_message_'.$type.'_duplicated')); + } else { + $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_duplicated')); + } + + return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); } } From 67fef5808ea9f5e30ec918d7a540c3af0a06f04e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:00:17 +0300 Subject: [PATCH 0829/1219] Flextype Box Plugin: Admin #125 #117 - Users Controller/Views implementation --- .../admin/app/Controllers/UsersConstroller.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/UsersConstroller.php b/site/plugins/admin/app/Controllers/UsersConstroller.php index c39aba4e..4d134213 100644 --- a/site/plugins/admin/app/Controllers/UsersConstroller.php +++ b/site/plugins/admin/app/Controllers/UsersConstroller.php @@ -8,6 +8,16 @@ class UsersController extends Controller { public function index($request, $response, $args) { - + + } + + public function registration($request, $response, $args) + { + + } + + public function registrationProcess($request, $response, $args) + { + } } From 9fd6f8c86efa45952aac3ff22e7c5d442173fff8 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:00:28 +0300 Subject: [PATCH 0830/1219] Flextype Box Plugin: Admin #125 #117 - Entries Controller/Views implementation --- site/plugins/admin/app/Controllers/EntriesController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index c1e698d3..97df7732 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -11,7 +11,6 @@ use function Flextype\Component\I18n\__; class EntriesController extends Controller { - protected function getEntriesQuery($entry) { if ($entry && $entry != '') { From 45c9834244c1cbc2ffb066dd2bea0a6b8fa56750 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:00:41 +0300 Subject: [PATCH 0831/1219] Flextype Box Plugin: Admin #125 #117 - Snippets Controller/Views implementation --- .../views/templates/extends/snippets/add.html | 18 +++++++ .../templates/extends/snippets/edit.html | 16 ++++++ .../templates/extends/snippets/index.html | 50 +++++++++++++++++++ .../templates/extends/snippets/rename.html | 20 ++++++++ 4 files changed, 104 insertions(+) create mode 100644 site/plugins/admin/views/templates/extends/snippets/add.html create mode 100644 site/plugins/admin/views/templates/extends/snippets/edit.html create mode 100644 site/plugins/admin/views/templates/extends/snippets/index.html create mode 100644 site/plugins/admin/views/templates/extends/snippets/rename.html diff --git a/site/plugins/admin/views/templates/extends/snippets/add.html b/site/plugins/admin/views/templates/extends/snippets/add.html new file mode 100644 index 00000000..9b6ff31d --- /dev/null +++ b/site/plugins/admin/views/templates/extends/snippets/add.html @@ -0,0 +1,18 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} +
+
+
+ + +
+
+ +
+
+
+
+{% endblock %} diff --git a/site/plugins/admin/views/templates/extends/snippets/edit.html b/site/plugins/admin/views/templates/extends/snippets/edit.html new file mode 100644 index 00000000..662b5021 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/snippets/edit.html @@ -0,0 +1,16 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} + + +
+
+
+ +
+
+
+
+{% endblock %} diff --git a/site/plugins/admin/views/templates/extends/snippets/index.html b/site/plugins/admin/views/templates/extends/snippets/index.html new file mode 100644 index 00000000..64df2369 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/snippets/index.html @@ -0,0 +1,50 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +{% if snippets_list|length > 0 %} + + + + + + + + + {% if snippets_list|length > 0 %} + {% for id in snippets_list %} + + + + + {% endfor %} + {% endif %} + +
{{ tr('admin_name') }}
+ {{ id }} + + + + + {{ tr('admin_delete') }} +
+{% endif %} +{% endblock %} diff --git a/site/plugins/admin/views/templates/extends/snippets/rename.html b/site/plugins/admin/views/templates/extends/snippets/rename.html new file mode 100644 index 00000000..66868b84 --- /dev/null +++ b/site/plugins/admin/views/templates/extends/snippets/rename.html @@ -0,0 +1,20 @@ +{% extends "plugins/admin/views/partials/base.html" %} + +{% block content %} +
+ {{ csrf() }} + + +
+
+
+ + +
+
+ +
+
+
+
+{% endblock %} From 9522a27d8be7742b879d7fa39b5b5ed99dae40f0 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:06:45 +0300 Subject: [PATCH 0832/1219] Slim Framework integration #118 #117 - Entries: fixes and refactoring --- flextype/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Entries.php b/flextype/Entries.php index df157a82..111cf305 100755 --- a/flextype/Entries.php +++ b/flextype/Entries.php @@ -41,7 +41,7 @@ class Entries */ public function fetch(string $id) { - $entry_file = Entries::_file_location($id); + $entry_file = $this->_file_location($id); if (Filesystem::has($entry_file)) { From 9eb272f145d90816915b43222b0fddbcfc10946f Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:07:39 +0300 Subject: [PATCH 0833/1219] Slim Framework integration #118 #117 - Fieldsets: fixes and refactoring --- flextype/Fieldsets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Fieldsets.php b/flextype/Fieldsets.php index ec60addc..376849be 100644 --- a/flextype/Fieldsets.php +++ b/flextype/Fieldsets.php @@ -40,7 +40,7 @@ class Fieldsets */ public function fetch(string $id) { - $fieldsets_file = Fieldsets::_file_location($id); + $fieldsets_file = $this->_file_location($id); if (Filesystem::has($fieldsets_file)) { if ($fieldsets_body = Filesystem::read($fieldsets_file)) { From acb363fe34272e9d8ab37e41bf70661aee48d8f5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:07:50 +0300 Subject: [PATCH 0834/1219] Slim Framework integration #118 #117 - Snippets: fixes and refactoring --- flextype/Snippets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index 3b3f70f1..f445f5cc 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -57,7 +57,7 @@ class Snippets */ public function fetch(string $id) { - $snippet_file = Fieldsets::_file_location($id); + $snippet_file = $this->_file_location($id); if (Filesystem::has($snippet_file)) { if ($snippet_body = Filesystem::read($snippet_file)) { From f413967297f96f0f25d939906a7a6d23602bf0a1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:10:39 +0300 Subject: [PATCH 0835/1219] Slim Framework integration #118 #117 - JsonParser: fixes and refactoring --- flextype/parsers/JsonParser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flextype/parsers/JsonParser.php b/flextype/parsers/JsonParser.php index 2addae06..ec32e205 100644 --- a/flextype/parsers/JsonParser.php +++ b/flextype/parsers/JsonParser.php @@ -68,7 +68,7 @@ class JsonParser { * * @param mixed $input A string containing JSON * @param int $encode_depth User specified recursion depth. - * @param bool $encode_options Bitmask consisting of encode options. + * @param int $encode_options Bitmask consisting of encode options. * @return mixed The JSON converted to a PHP value * */ @@ -93,9 +93,9 @@ class JsonParser { * $array = JsonParser::decode($json_file_content); * * @param string $input A string containing JSON - * @param int $decode_assoc When TRUE, returned objects will be converted into associative arrays. + * @param bool $decode_assoc When TRUE, returned objects will be converted into associative arrays. * @param int $decode_depth User specified recursion depth. - * @param bool $decode_options Bitmask consisting of decode options. + * @param int $decode_options Bitmask consisting of decode options. * @return mixed The JSON converted to a PHP value * * @throws ParseException If the JSON is not valid From f76afa95f233392bd4f1a189f56d2944a1c95208 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 01:11:58 +0300 Subject: [PATCH 0836/1219] Flextype Box Plugin: Admin #125 #117 - Snippets Controller/Views implementation --- site/plugins/admin/app/Controllers/SnippetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php index d8df62cf..9a979618 100644 --- a/site/plugins/admin/app/Controllers/SnippetsController.php +++ b/site/plugins/admin/app/Controllers/SnippetsController.php @@ -82,7 +82,7 @@ class SnippetsController extends Controller public function editProcess($request, $response, $args) { - if ($this->snippets->update($request->getParsedBody()['id']), $request->getParsedBody()['data'])) { + if ($this->snippets->update($request->getParsedBody()['id'], $request->getParsedBody()['data'])) { $this->flash->addMessage('success', __('admin_message_snippets_saved')); } else { $this->flash->addMessage('error', __('admin_message_snippets_was_not_saved')); From cfa1c52e1958723bac1d26308f905837676e24e9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 22:37:56 +0300 Subject: [PATCH 0837/1219] Flextype Box Plugin: Admin #125 #117 - Snippets Controller/Views implementation --- site/plugins/admin/app/Controllers/SnippetsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php index 9a979618..fd4e7ea4 100644 --- a/site/plugins/admin/app/Controllers/SnippetsController.php +++ b/site/plugins/admin/app/Controllers/SnippetsController.php @@ -62,6 +62,7 @@ class SnippetsController extends Controller return $this->view->render($response, 'plugins/admin/views/templates/extends/snippets/edit.html', [ 'menu_item' => 'snippets', + 'id' => $request->getQueryParams()['id'], 'data' => $this->snippets->fetch($request->getQueryParams()['id']), 'links' => [ 'snippets' => [ From c646ba79d25be20bff6105dc5646ad2c2294db1e Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 22:38:11 +0300 Subject: [PATCH 0838/1219] Slim Framework integration #118 #117 - Snippets: fixes and refactoring --- flextype/Snippets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Snippets.php b/flextype/Snippets.php index f445f5cc..335b42d6 100644 --- a/flextype/Snippets.php +++ b/flextype/Snippets.php @@ -119,7 +119,7 @@ class Snippets */ public function update(string $id, string $data) : bool { - $snippet_file = $this->_file_location($snippet); + $snippet_file = $this->_file_location($id); if (Filesystem::has($snippet_file)) { return Filesystem::write($snippet_file, $data); From fbdedc7846d965819d8bd02f04715564f7c376a3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 23:51:34 +0300 Subject: [PATCH 0839/1219] Slim Framework integration #118 #117 - Snippets: fixes and refactoring --- .../app/Controllers/SnippetsController.php | 71 +++++-------------- 1 file changed, 18 insertions(+), 53 deletions(-) diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php index fd4e7ea4..2e2ba889 100644 --- a/site/plugins/admin/app/Controllers/SnippetsController.php +++ b/site/plugins/admin/app/Controllers/SnippetsController.php @@ -95,14 +95,12 @@ class SnippetsController extends Controller public function rename($request, $response, $args) { return $this->view->render($response, - 'plugins/admin/views/templates/extends/templates/rename.html', [ - 'menu_item' => 'templates', - 'types' => ['partial' => __('admin_partial'), 'template' => __('admin_template')], + 'plugins/admin/views/templates/extends/snippets/rename.html', [ + 'menu_item' => 'snippets', 'id_current' => $request->getQueryParams()['id'], - 'type_current' => (($request->getQueryParams()['type'] && $request->getQueryParams()['type'] == 'partial') ? 'partial' : 'template'), 'links' => [ 'templates' => [ - 'link' => $this->router->pathFor('admin.templates.index'), + 'link' => $this->router->pathFor('admin.snippets.index'), 'title' => __('admin_templates'), 'attributes' => ['class' => 'navbar-item active'] ], @@ -112,70 +110,37 @@ class SnippetsController extends Controller public function renameProcess($request, $response, $args) { - $type = $request->getParsedBody()['type_current']; - - if ($type == 'partial') { - $_type = '/templates/partials/'; + if ($this->snippets->rename( + $request->getParsedBody()['id_current'], + $request->getParsedBody()['id']) + ) { + $this->flash->addMessage('success', __('admin_message_snippets_renamed')); } else { - $_type = '/templates/'; + $this->flash->addMessage('error', __('admin_message_snippets_was_not_renamed')); } - if (!Filesystem::has(PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html')) { - if (Filesystem::rename( - PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id_current'] . '.html', - PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()['id'] . '.html') - ) { - $this->flash->addMessage('success', __('admin_message_'.$type.'_renamed')); - } else { - $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_renamed')); - } - } else { - $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_renamed')); - } - - return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); + return $response->withRedirect($this->container->get('router')->pathFor('admin.snippets.index')); } public function deleteProcess($request, $response, $args) { - $type = $request->getParsedBody()['type']; - - if ($type == 'partial') { - $_type = '/templates/partials/'; + if ($this->snippets->delete($request->getParsedBody()['snippet-id'])) { + $this->flash->addMessage('success', __('admin_message_snippets_deleted')); } else { - $_type = '/templates/'; + $this->flash->addMessage('error', __('admin_message_snippets_was_not_deleted')); } - $file_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; - - if (Filesystem::delete($file_path)) { - $this->flash->addMessage('success', __('admin_message_'.$type.'_deleted')); - } else { - $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_deleted')); - } - - return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); + return $response->withRedirect($this->container->get('router')->pathFor('admin.snippets.index')); } public function duplicateProcess($request, $response, $args) { - $type = $request->getParsedBody()['type']; - - if ($type == 'partial') { - $_type = '/templates/partials/'; + if ($this->snippets->copy($request->getParsedBody()['snippet-id'], $request->getParsedBody()['snippet-id'] . '-duplicate-' . date("Ymd_His"))) { + $this->flash->addMessage('success', __('admin_message_snippets_duplicated')); } else { - $_type = '/templates/'; + $this->flash->addMessage('error', __('admin_message_snippets_was_not_duplicated')); } - $file_path = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '.html'; - $file_path_new = PATH['themes'] . '/' . $this->registry->get('settings.theme') . $_type . $request->getParsedBody()[$type.'-id'] . '-duplicate-' . date("Ymd_His") . '.html'; - - if (Filesystem::copy($file_path, $file_path_new)) { - $this->flash->addMessage('success', __('admin_message_'.$type.'_duplicated')); - } else { - $this->flash->addMessage('error', __('admin_message_'.$type.'_was_not_duplicated')); - } - - return $response->withRedirect($this->container->get('router')->pathFor('admin.templates.index')); + return $response->withRedirect($this->container->get('router')->pathFor('admin.snippets.index')); } } From f38554a1a30b7ca1f60b4950bbc482b9023bd52b Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 23:51:46 +0300 Subject: [PATCH 0840/1219] Slim Framework integration #118 #117 - Snippets: fixes and refactoring --- site/plugins/admin/views/templates/extends/snippets/rename.html | 1 - 1 file changed, 1 deletion(-) diff --git a/site/plugins/admin/views/templates/extends/snippets/rename.html b/site/plugins/admin/views/templates/extends/snippets/rename.html index 66868b84..4b78b9bb 100644 --- a/site/plugins/admin/views/templates/extends/snippets/rename.html +++ b/site/plugins/admin/views/templates/extends/snippets/rename.html @@ -4,7 +4,6 @@
{{ csrf() }} -
From e266bc6c1f4da27b5291d63330b6fd08e61c269b Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 29 May 2019 23:52:08 +0300 Subject: [PATCH 0841/1219] Slim Framework integration #118 #117 - Snippets: fixes and refactoring --- site/plugins/admin/routes.php | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/site/plugins/admin/routes.php b/site/plugins/admin/routes.php index 307e5ba5..09e6b432 100644 --- a/site/plugins/admin/routes.php +++ b/site/plugins/admin/routes.php @@ -12,7 +12,7 @@ $app->post('/admin/settings/clear-cache', 'SettingsController:clearCache')->setN // Plugins Controller $app->get('/admin/plugins', 'PluginsController:index')->setName('admin.plugins.index'); -$app->post('/admin/plugins/change-status', 'PluginsController:changeStatus')->setName('admin.plugins.change-status'); +$app->post('/admin/plugins/update-status', 'PluginsController:pluginStatusProcess')->setName('admin.plugins.update-status'); // EntriesController $app->get('/admin/entries', 'EntriesController:index')->setName('admin.entries.index'); @@ -33,11 +33,11 @@ $app->get('/admin/fieldsets', 'FieldsetsController:index')->setName('admin.field $app->get('/admin/fieldsets/add', 'FieldsetsController:add')->setName('admin.fieldsets.add'); $app->post('/admin/fieldsets/add', 'FieldsetsController:addProcess')->setName('admin.fieldsets.addProcess'); $app->get('/admin/fieldsets/edit', 'FieldsetsController:edit')->setName('admin.fieldsets.edit'); -$app->post('/admin/fieldsets/edit', 'FieldsetsController:editProcess')->setName('admin.fieldsets.addProcess'); +$app->post('/admin/fieldsets/edit', 'FieldsetsController:editProcess')->setName('admin.fieldsets.editProcess'); $app->get('/admin/fieldsets/rename', 'FieldsetsController:rename')->setName('admin.fieldsets.rename'); $app->post('/admin/fieldsets/rename', 'FieldsetsController:renameProcess')->setName('admin.fieldsets.renameProcess'); -$app->get('/admin/fieldsets/duplicate', 'FieldsetsController:duplicateProcess')->setName('admin.fieldsets.duplicateProcess'); -$app->get('/admin/fieldsets/delete', 'FieldsetsController:deleteProcess')->setName('admin.fieldsets.deleteProcess'); +$app->post('/admin/fieldsets/duplicate', 'FieldsetsController:duplicateProcess')->setName('admin.fieldsets.duplicateProcess'); +$app->post('/admin/fieldsets/delete', 'FieldsetsController:deleteProcess')->setName('admin.fieldsets.deleteProcess'); // TemplatesController $app->get('/admin/templates', 'TemplatesController:index')->setName('admin.templates.index'); @@ -47,16 +47,20 @@ $app->get('/admin/templates/edit', 'TemplatesController:edit')->setName('admin.t $app->post('/admin/templates/edit', 'TemplatesController:editProcess')->setName('admin.templates.addProcess'); $app->get('/admin/templates/rename', 'TemplatesController:rename')->setName('admin.templates.rename'); $app->post('/admin/templates/rename', 'TemplatesController:renameProcess')->setName('admin.templates.renameProcess'); -$app->get('/admin/templates/duplicate', 'TemplatesController:duplicateProcess')->setName('admin.templates.duplicateProcess'); -$app->get('/admin/templates/delete', 'TemplatesController:deleteProcess')->setName('admin.templates.deleteProcess'); +$app->post('/admin/templates/duplicate', 'TemplatesController:duplicateProcess')->setName('admin.templates.duplicateProcess'); +$app->post('/admin/templates/delete', 'TemplatesController:deleteProcess')->setName('admin.templates.deleteProcess'); // SnippetsController -$app->get('/admin/snippets', 'SnippetsController:index')->setName('admin.templates.index'); -$app->get('/admin/snippets/add', 'SnippetsController:add')->setName('admin.templates.add'); -$app->post('/admin/snippets/add', 'SnippetsController:addProcess')->setName('admin.templates.addProcess'); -$app->get('/admin/snippets/edit', 'SnippetsController:edit')->setName('admin.templates.edit'); -$app->post('/admin/snippets/edit', 'SnippetsController:editProcess')->setName('admin.templates.addProcess'); -$app->get('/admin/snippets/rename', 'SnippetsController:rename')->setName('admin.templates.rename'); -$app->post('/admin/snippets/rename', 'SnippetsController:renameProcess')->setName('admin.templates.renameProcess'); -$app->get('/admin/snippets/duplicate', 'SnippetsController:duplicateProcess')->setName('admin.templates.duplicateProcess'); -$app->get('/admin/snippets/delete', 'SnippetsController:deleteProcess')->setName('admin.templates.deleteProcess'); +$app->get('/admin/snippets', 'SnippetsController:index')->setName('admin.snippets.index'); +$app->get('/admin/snippets/add', 'SnippetsController:add')->setName('admin.snippets.add'); +$app->post('/admin/snippets/add', 'SnippetsController:addProcess')->setName('admin.snippets.addProcess'); +$app->get('/admin/snippets/edit', 'SnippetsController:edit')->setName('admin.snippets.edit'); +$app->post('/admin/snippets/edit', 'SnippetsController:editProcess')->setName('admin.snippets.addProcess'); +$app->get('/admin/snippets/rename', 'SnippetsController:rename')->setName('admin.snippets.rename'); +$app->post('/admin/snippets/rename', 'SnippetsController:renameProcess')->setName('admin.snippets.renameProcess'); +$app->post('/admin/snippets/duplicate', 'SnippetsController:duplicateProcess')->setName('admin.snippets.duplicateProcess'); +$app->post('/admin/snippets/delete', 'SnippetsController:deleteProcess')->setName('admin.snippets.deleteProcess'); + +// UsersController +$app->get('/admin/registration', 'UsersController:registration')->setName('admin.users.registration'); +$app->get('/admin/registrationProcess', 'UsersController:registrationProcess')->setName('admin.users.registrationProcess'); From 7c37a7dc29ab26b2123f5e0aaa3999feafaf5d41 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 30 May 2019 23:00:44 +0300 Subject: [PATCH 0842/1219] Flextype Box Plugin: Admin #125 #117 - Users Controller/Views implementation --- .../app/Controllers/UsersConstroller.php | 75 ++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/UsersConstroller.php b/site/plugins/admin/app/Controllers/UsersConstroller.php index 4d134213..7939335e 100644 --- a/site/plugins/admin/app/Controllers/UsersConstroller.php +++ b/site/plugins/admin/app/Controllers/UsersConstroller.php @@ -2,7 +2,12 @@ namespace Flextype; +use Flextype\Component\Filesystem\Filesystem; +use Flextype\Component\Session\Session; +use Flextype\Component\Registry\Registry; +use Flextype\Component\Text\Text; use function Flextype\Component\I18n\__; +use Psr\Container\ContainerInterface; class UsersController extends Controller { @@ -11,13 +16,81 @@ class UsersController extends Controller } + + public function login($request, $response, $args) + { + if (!Users::isLoggedIn()) { + return $this->container->get('view')->render($response, + 'plugins/admin/views/templates/users/login.html', [ + 'user_is_logged' => Users::isLoggedIn() + ]); + } else { + return $response->withRedirect($this->container->get('router')->urlFor('admin.users.registration')); + } + } + + public function loginProcess($request, $response, $args) + { + $data = $request->getParsedBody(); + + if (Filesystem::has($_user_file = PATH['site'] . '/accounts/' . $data['username'] . '.json')) { + $user_file = JsonParser::decode(Filesystem::read($_user_file)); + if (password_verify(trim($data['password']), $user_file['hashed_password'])) { + Session::set('username', $user_file['username']); + Session::set('role', $user_file['role']); + return $response->withRedirect('admin/entries'); + } else { + //Notification::set('error', __('admin_message_wrong_username_password')); + } + } else { + //Notification::set('error', __('admin_message_wrong_username_password')); + } + } + public function registration($request, $response, $args) { - + if (!Users::isLoggedIn()) { + return $this->view->render($response, + 'plugins/admin/views/templates/users/registration.html'); + } else { + return $response->withRedirect($this->container->get('router')->urlFor('admin.entires.index')); + } } public function registrationProcess($request, $response, $args) { + $data = $request->getParsedBody(); + if (!Filesystem::has($_user_file = PATH['site'] . '/accounts/' . Text::safeString($data['username']) . '.json')) { + if (Filesystem::write( + PATH['site'] . '/accounts/' . $data['username'] . '.json', + JsonParser::encode(['username' => Text::safeString($data['username']), + 'hashed_password' => password_hash($data['password'], PASSWORD_BCRYPT), + 'email' => $data['email'], + 'role' => 'admin', + 'state' => 'enabled']))) { + return $response->withRedirect($this->container->get('router')->urlFor('admin.entries.index')); + } else { + //return false; + } + } else { + //return false; + } } } + + +class Users +{ + public static function isUsersExists() : bool + { + // Get Users Profiles + $users = Filesystem::listContents(PATH['site'] . '/accounts/'); + // If any users exists then return true + return ($users && count($users) > 0) ? true : false; + } + public static function isLoggedIn() : bool + { + return (Session::exists('role') && Session::get('role') == 'admin') ? true : false; + } +} From 452dd7fd1a17e22dc947c712a775d2a1b94c13fe Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 30 May 2019 23:00:54 +0300 Subject: [PATCH 0843/1219] Flextype Box Plugin: Admin #125 #117 - Users Controller/Views implementation --- site/plugins/admin/views/templates/users/registration.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/plugins/admin/views/templates/users/registration.html b/site/plugins/admin/views/templates/users/registration.html index 8c1b75a3..351ec960 100644 --- a/site/plugins/admin/views/templates/users/registration.html +++ b/site/plugins/admin/views/templates/users/registration.html @@ -3,8 +3,7 @@ {% block content %} - - + {{ csrf() }}

{{ tr('admin_create_new_user') }}

From 16c0d34db7e6a0d56cdb00ebcfdd896fd1723783 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 30 May 2019 23:48:58 +0300 Subject: [PATCH 0844/1219] Flextype Box Plugin: Admin #125 #117 - Users Controller/Views implementation --- site/plugins/admin/app/Controllers/UsersConstroller.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/plugins/admin/app/Controllers/UsersConstroller.php b/site/plugins/admin/app/Controllers/UsersConstroller.php index 7939335e..fb0a55fa 100644 --- a/site/plugins/admin/app/Controllers/UsersConstroller.php +++ b/site/plugins/admin/app/Controllers/UsersConstroller.php @@ -62,7 +62,7 @@ class UsersController extends Controller $data = $request->getParsedBody(); if (!Filesystem::has($_user_file = PATH['site'] . '/accounts/' . Text::safeString($data['username']) . '.json')) { - if (Filesystem::write( + if (Filesystem::write( PATH['site'] . '/accounts/' . $data['username'] . '.json', JsonParser::encode(['username' => Text::safeString($data['username']), 'hashed_password' => password_hash($data['password'], PASSWORD_BCRYPT), @@ -86,9 +86,11 @@ class Users { // Get Users Profiles $users = Filesystem::listContents(PATH['site'] . '/accounts/'); + // If any users exists then return true return ($users && count($users) > 0) ? true : false; } + public static function isLoggedIn() : bool { return (Session::exists('role') && Session::get('role') == 'admin') ? true : false; From fcbfc2eede7f3b41255e37aaf392ad3891aafcb7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 31 May 2019 00:29:07 +0300 Subject: [PATCH 0845/1219] Slim Framework integration #118 #117 - GlobalVars: is_logged added --- flextype/twig/GlobalVarsTwigExtension.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flextype/twig/GlobalVarsTwigExtension.php b/flextype/twig/GlobalVarsTwigExtension.php index 83f8ccf8..4ede5268 100644 --- a/flextype/twig/GlobalVarsTwigExtension.php +++ b/flextype/twig/GlobalVarsTwigExtension.php @@ -12,6 +12,8 @@ namespace Flextype; +use Flextype\Component\Session\Session; + class GlobalVarsTwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface { /** @@ -39,7 +41,8 @@ class GlobalVarsTwigExtension extends \Twig_Extension implements \Twig_Extension 'PATH_CONFIG_SITE' => PATH['config']['site'], 'PATH_CACHE' => PATH['cache'], 'flextype_version' => FLEXTYPE_VERSION, - 'registry' => $this->flextype['registry']->dump() + 'registry' => $this->flextype['registry']->dump(), + 'is_logged' => ((Session::exists('role') && Session::get('role') == 'admin') ? true : false) ]; } } From 05ace4176586655b5cc700fe034f005251b6e4d7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 31 May 2019 00:29:33 +0300 Subject: [PATCH 0846/1219] Slim Framework integration #118 #117 - base.html updates --- site/plugins/admin/views/partials/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index f6dc608d..beede916 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -57,7 +57,7 @@
- {% if user_is_logged %} + {% if is_logged %}