Skip to content

Commit

Permalink
Merge branch 'release/2.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
adrenth committed Aug 18, 2020
2 parents 64e318e + aeaf3f6 commit ea2c9ce
Show file tree
Hide file tree
Showing 9 changed files with 190 additions and 103 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 2.5.3

* Improve / fixes redirect rule caching (thanks to Eric Pfeiffer)
* Update Spanish language (thanks to Juan David M)
* Update Language files (help wanted!)

# 2.5.2

* Fix bug that causes re-writing the redirect rules file when hits are updated
Expand Down
1 change: 1 addition & 0 deletions classes/PublishManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ private function publishToCache(array $redirects): void

unset($redirect);

$this->cacheManager->flush();
$this->cacheManager->putRedirectRules($redirects);
}
}
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"archive": {
"exclude": [
".gitignore",
".gitlab-ci.yml",
".idea/"
]
}
Expand Down
2 changes: 1 addition & 1 deletion lang/en/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
'no_data' => 'No data yet',
'top_crawlers_this_month' => 'Top :top crawlers this month',
'top_redirects_this_month' => 'Top :top redirects this month',
'activity_last_three_months' => 'Activity last 3 months'
'activity_last_three_months' => 'Activity last 3 months',
],
'title' => [
'import' => 'Import',
Expand Down
196 changes: 110 additions & 86 deletions lang/es/lang.php

Large diffs are not rendered by default.

32 changes: 29 additions & 3 deletions lang/fr/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
'test_lab_enabled_comment' => 'TestLab vous permet de tester en masse vos redirections.',
'caching_enabled_label' => 'Caching of redirects (advanced)', // TODO
'caching_enabled_comment' => 'Improves the redirect engine when having a lot of redirects. ' // TODO
. 'CAUTION: Cache driver `file` and `database` are NOT supported. '
. 'Recommended driver is `memcached` or a similar "in-memory" caching driver.',
. 'CAUTION: Cache driver `file` and `database` are NOT supported. ' // TODO
. 'Recommended driver is `memcached` or a similar "in-memory" caching driver.', // TODO
'relative_paths_enabled_label' => 'Use relative paths', // TODO
'relative_paths_enabled_command' => 'The redirect engine will generate relative paths instead of absolute paths.', // TODO
],
'redirect' => [
'redirect' => 'Redirect',
Expand Down Expand Up @@ -107,6 +109,14 @@
'sparkline_30d' => 'Hits (30d)', // TODO
'has_hits' => 'Has hits', // TODO
'minimum_hits' => 'Minimum # hits', // TODO
'ignore_query_parameters' => 'Ignore query parameters', // TODO
'ignore_query_parameters_comment' => 'The redirect engine will ignore all query parameters.', // TODO
'ignore_case' => 'Ignore case', // TODO
'ignore_case_comment' => 'The redirect engine will do case-insensitive matching.', // TODO
'ignore_trailing_slash' => 'Ignore trailing slash', // TODO
'ignore_trailing_slash_comment' => 'The redirect engine will ignore trailing slashes.', // TODO
'last_used_at' => 'Last hit', // TODO
'updated_at' => 'Updated at', // TODO
'invalid_regex' => 'Invalid regular expression.', // TODO
],
'list' => [
Expand All @@ -128,6 +138,7 @@
'input_path' => 'Chemin d\'entrée',
'input_path_comment' => 'Le chemin d\'entrée à tester. Ex. /old-blog/category/123',
'input_path_placeholder' => '/chemin/a/tester',
'input_scheme' => 'Input scheme', // TODO
'test_date' => 'Date du test',
'test_date_comment' => 'Si vous avez planifié cette redirections, '
. 'vous pouvez la tester à une date spécifique.',
Expand Down Expand Up @@ -191,6 +202,7 @@
'no_data' => 'Pas de donnée',
'top_crawlers_this_month' => 'Top :top: crawlers du mois',
'top_redirects_this_month' => 'Top :top: redirections du mois',
'activity_last_three_months' => 'Activity last 3 months', // TODO
],
'title' => [
'import' => 'Import',
Expand All @@ -210,20 +222,26 @@
'from_request_log' => 'A partir des logs',
'new_redirect' => 'Ajouter',
'create_redirects' => 'Créer redirection',
'create_redirect' => 'Create redirect', // TODO
'create_and_new' => 'Create and new', // TODO
'delete' => 'Supprimer',
'enable' => 'Activer',
'disable' => 'Désactiver',
'reorder_redirects' => 'Réordonner',
'export' => 'Exporter',
'import' => 'Importer',
'settings' => 'Settings', // TODO
'categories' => 'Catégories',
'extensions' => 'Extensions', // TODO
'new_category' => 'Nouvelle catégorie',
'reset_statistics' => 'Réinitialisation des statistiques',
'logs' => 'Log de redirection',
'empty_redirect_log' => 'Vider le log de redirection',
'clear_cache' => 'Clear cache', // TODO
'stop' => 'Stop', // TODO
'reset_all' => 'Reset statistics for all redirects', // TODO
'all_redirects' => 'all redirects', // TODO
'bulk_actions' => 'Bulk actions', // TODO
],
'tab' => [
'tab_general' => 'Général',
Expand All @@ -232,15 +250,20 @@
'tab_scheduling' => 'Planification',
'tab_test_lab' => 'TestLab',
'tab_advanced' => 'Avancé',
'tab_logs' => 'Event log', // TODO
],
'flash' => [
'success_created_redirects' => ':count redirections crée avec succés',
'static_page_redirect_not_supported' => 'Cette redirection ne peut pas être modifiée. Plugin RainLab.Pages est nécessaire.',
'truncate_success' => 'Toute les redirections ont été supprimées',
'delete_selected_success' => 'Les redirections selectionnée ont été supprimées',
'cache_cleared_success' => 'Successfully cleared redirect cache', // TODO
'statistics_reset_success' => 'All statistics have been successfully reset', // TODO
'enabled_all_redirects_success' => 'All redirects have been successfully enabled', // TODO
'disabled_all_redirects_success' => 'All redirects have been successfully disabled', // TODO
'deleted_all_redirects_success' => 'All redirects have been successfully deleted', // TODO
],
'import_export' => [ // TODO
'import_export' => [
'match_type' => 'Match Type [match_type] (Allowed values: exact, placeholders, regex)',
'category_id' => 'Category [category_id]',
'target_type' => 'Target Type [target_type] (Allowed values: path_or_url, cms_page, static_page, none)',
Expand All @@ -258,6 +281,9 @@
'to_date' => 'Scheduled date to [to_date] (YYYY-MM-DD or empty)',
'sort_order' => 'Priority [sort_order]',
'is_enabled' => 'Enabled [is_enabled] (1 = enable redirect, 0 = disable redirect [default])',
'ignore_query_parameters' => 'Ignore Query Parameters [ignore_query_parameters] (1 = yes, 0 = no [default])',
'ignore_case' => 'Ignore Case [ignore_case] (1 = yes, 0 = no [default])',
'ignore_trailing_slash' => 'Ignore Trailing Slashes [ignore_trailing_slash] (1 = yes, 0 = no [default])',
'test_lab' => 'Test Lab [test_lab] (1 = enable Test Lab, 0 = disable TestLab [default])',
'test_lab_path' => 'Test Lab path [test_lab_path] (required if match_type = placeholders)',
'system' => 'System [system] (1 = system generated redirect, 0 = user generated redirect [default])',
Expand Down
21 changes: 13 additions & 8 deletions lang/ru/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,23 @@
'caching_enabled_comment' => 'Улучшает механизм перенаправления при большом количестве перенаправлений. '
. 'ВНИМАНИЕ: Драйвер кэша `file` и `database` НЕ поддерживаются. '
. 'Рекомендуемым драйвером является `memcached` или аналогичный драйвер "in-memory" для кеширования в памяти.',
'auto_redirect_creation_enabled_label' => 'Автоматическое создание перенаправления',
'auto_redirect_creation_enabled_comment' => 'Автоматически создавать перенаправления когда slug для '
. 'Page или Static Page был изменён.',
'relative_paths_enabled_label' => 'Use relative paths', // TODO
'relative_paths_enabled_command' => 'The redirect engine will generate relative paths instead of absolute paths.', // TODO
],
'redirect' => [
'redirect' => 'Редиректы',
'from_url' => 'Исходный путь',
'from_url_placeholder' => '/source/path',
'from_url_comment' => 'Исходный путь относительно корня сайта.',
'from_scheme' => 'Source scheme', // TODO
'from_scheme_comment' => 'Force match on scheme. If HTTP is selected <u>http://domain.com/path</u> will '
'from_scheme_comment' => 'Force match on scheme. If HTTP is selected <u>http://domain.com/path</u> will ' // TODO
. 'match and <u>https://domain.com/path</u> does not match.', // TODO
'to_url' => 'Путь редиректа или URL',
'to_url_placeholder' => '/absolute/path, relative/path или http://target.url',
'to_url_comment' => 'Абсолютный путь, относительный путь или URL для перенаправления.',
'to_url_required_if' => 'Исходный путь или URL обязателен для заполнения',
'to_scheme' => 'Target scheme', // TODO
'to_scheme_comment' => 'Target scheme will be forced to HTTP or HTTPS '
'to_scheme_comment' => 'Target scheme will be forced to HTTP or HTTPS ' // TODO
. 'or choose AUTOMATIC to use the default scheme of the website.', // TODO
'scheme_auto' => 'Automatic', // TODO
'cms_page_required_if' => 'Пожалуйста, выберите страницу CMS для перенаправления',
Expand All @@ -73,7 +72,6 @@
'requirements_prompt' => 'Добавить новый параметр',
'replacement' => 'Замена',
'replacement_comment' => 'Пропишите (опционально) замену для текущей метки. В целевом URL метка будет заменена на это значение.',

'permanent' => '301 - перемещено навсегда',
'temporary' => '302 - перемещено временно',
'see_other' => '303 - смотреть другое',
Expand All @@ -92,7 +90,6 @@
'system_tip' => 'Системный редирект',
'user_tip' => 'Пользовательский редирект',
'type' => 'Тип',
'last_used_at' => 'Последнее применение',
'and_delete_log_item' => 'И удалить выбранные элементы лога',
'category' => 'Категория',
'categories' => 'Категории',
Expand All @@ -111,6 +108,10 @@
'minimum_hits' => 'Минимум # хитов',
'ignore_query_parameters' => 'Игнорировать параметры запроса (рекомендуется).',
'ignore_query_parameters_comment' => 'Движок будет игнорировать все параметры запроса из исходного пути.',
'ignore_case' => 'Ignore case', // TODO
'ignore_case_comment' => 'The redirect engine will do case-insensitive matching.', // TODO
'ignore_trailing_slash' => 'Ignore trailing slash', // TODO
'ignore_trailing_slash_comment' => 'The redirect engine will ignore trailing slashes.', // TODO
'last_used_at' => 'Последний хит',
'updated_at' => 'Обновлено',
'invalid_regex' => 'Неправильное регулярное выражение.',
Expand Down Expand Up @@ -226,6 +227,7 @@
'import' => 'Импорт',
'settings' => 'Настройки',
'categories' => 'Категории',
'extensions' => 'Extensions', // TODO
'new_category' => 'Новая категория',
'reset_statistics' => 'Сбросить статистику',
'logs' => 'Лог редиректов',
Expand All @@ -243,6 +245,7 @@
'tab_scheduling' => 'Расписание',
'tab_test_lab' => 'TestLab',
'tab_advanced' => 'Продвинутый',
'tab_logs' => 'Event log', // TODO
],
'flash' => [
'success_created_redirects' => 'Успешно создано :count редирект(ов)',
Expand All @@ -255,7 +258,7 @@
'disabled_all_redirects_success' => 'Все перенаправления были успешно выключены',
'deleted_all_redirects_success' => 'Все перенаправления были успешно удалены',
],
'import_export' => [ // TODO
'import_export' => [
'match_type' => 'Match Type [match_type] (Допустимые значения: exact, placeholders, regex)',
'category_id' => 'Категория [category_id]',
'target_type' => 'Target Type [target_type] (Допустимые значения: path_or_url, cms_page, static_page, none)',
Expand All @@ -274,6 +277,8 @@
'sort_order' => 'Приоритет [sort_order]',
'is_enabled' => 'Включен [is_enabled] (1 = редирект включен, 0 = редирект отключен [default])',
'ignore_query_parameters' => 'Ignore Query Parameters [ignore_query_parameters] (1 = ignore query parameters, 0 = include query parameters [default])',
'ignore_case' => 'Ignore Case [ignore_case] (1 = yes, 0 = no [default])', // TODO
'ignore_trailing_slash' => 'Ignore Trailing Slashes [ignore_trailing_slash] (1 = yes, 0 = no [default])', // TODO
'test_lab' => 'TestLab [test_lab] (1 = TestLab включен, 0 = TestLab выключен [default])',
'test_lab_path' => 'TestLab path [test_lab_path] (требуется, если match_type = placeholders)',
'system' => 'System [system] (1 = система сгенерировала редирект, 0 = пользователь создал редирект [default])',
Expand Down
32 changes: 28 additions & 4 deletions lang/sv/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
'test_lab_enabled_comment' => 'TestLab allows you to mass test your redirects.', // TODO
'caching_enabled_label' => 'Caching of redirects (advanced)', // TODO
'caching_enabled_comment' => 'Improves the redirect engine when having a lot of redirects. ' // TODO
. 'CAUTION: Cache driver `file` and `database` are NOT supported. '
. 'Recommended driver is `memcached` or a similar "in-memory" caching driver.',
. 'CAUTION: Cache driver `file` and `database` are NOT supported. '// TODO
. 'Recommended driver is `memcached` or a similar "in-memory" caching driver.',// TODO
'relative_paths_enabled_label' => 'Use relative paths', // TODO
'relative_paths_enabled_command' => 'The redirect engine will generate relative paths instead of absolute paths.',// TODO
],
'redirect' => [
'redirect' => 'Ompekning',
Expand Down Expand Up @@ -87,7 +89,6 @@
'system_tip' => 'Systemskapad ompekning',
'user_tip' => 'Andvändargenererad ompekning',
'type' => 'Typ',
'last_used_at' => 'Användes senast',
'and_delete_log_item' => 'Och radera valda log-filer',
'category' => 'Kategori',
'categories' => 'Kategorier',
Expand All @@ -104,6 +105,14 @@
'sparkline_30d' => 'Hits (30d)', // TODO
'has_hits' => 'Has hits', // TODO
'minimum_hits' => 'Minimum # hits', // TODO
'ignore_query_parameters' => 'Ignore query parameters', // TODO
'ignore_query_parameters_comment' => 'The redirect engine will ignore all query parameters.', // TODO
'ignore_case' => 'Ignore case', // TODO
'ignore_case_comment' => 'The redirect engine will do case-insensitive matching.', // TODO
'ignore_trailing_slash' => 'Ignore trailing slash', // TODO
'ignore_trailing_slash_comment' => 'The redirect engine will ignore trailing slashes.', // TODO
'last_used_at' => 'Användes senast',
'updated_at' => 'Updated at', // TODO
'invalid_regex' => 'Invalid regular expression.', // TODO
],
'list' => [
Expand Down Expand Up @@ -187,6 +196,7 @@
'no_data' => 'No data', // TODO
'top_crawlers_this_month' => 'Top :top crawlers this month', // TODO
'top_redirects_this_month' => 'Top :top redirects this month', // TODO
'activity_last_three_months' => 'Activity last 3 months', // TODO
],
'title' => [
'import' => 'Importera',
Expand All @@ -206,20 +216,26 @@
'from_request_log' => 'Från anropslogg',
'new_redirect' => 'Ny ompekning',
'create_redirects' => 'Skapa ompekning',
'create_redirect' => 'Create redirect', // TODO
'create_and_new' => 'Create and new', // TODO
'delete' => 'Radera',
'enable' => 'Aktivera',
'disable' => 'Inaktivera',
'reorder_redirects' => 'Omsortera',
'export' => 'Exportera',
'import' => 'Importera',
'settings' => 'Settings', // TODO
'categories' => 'Kategorier',
'extensions' => 'Extensions', // TODO
'new_category' => 'Ny kategori',
'reset_statistics' => 'Återställ statistik',
'logs' => 'Redirect log', // TODO
'empty_redirect_log' => 'Empty redirect log', // TODO
'clear_cache' => 'Clear cache', // TODO
'stop' => 'Stop', // TODO
'reset_all' => 'Reset statistics for all redirects', // TODO
'all_redirects' => 'all redirects', // TODO
'bulk_actions' => 'Bulk actions', // TODO
],
'tab' => [
'tab_general' => 'Allmänt',
Expand All @@ -228,15 +244,20 @@
'tab_scheduling' => 'Schemalägg',
'tab_test_lab' => 'TestLab', // TODO
'tab_advanced' => 'Advanced', // TODO
'tab_logs' => 'Event log', // TODO
],
'flash' => [
'success_created_redirects' => 'Skapade :count ompekningar',
'static_page_redirect_not_supported' => 'This redirect cannot be modified. Plugin RainLab.Pages is required.', // TODO
'truncate_success' => 'Successfully deleted all records', // TODO
'delete_selected_success' => 'Successfully deleted selected records', // TODO
'cache_cleared_success' => 'Successfully cleared redirect cache', // TODO
'statistics_reset_success' => 'All statistics have been successfully reset', // TODO
'enabled_all_redirects_success' => 'All redirects have been successfully enabled', // TODO
'disabled_all_redirects_success' => 'All redirects have been successfully disabled', // TODO
'deleted_all_redirects_success' => 'All redirects have been successfully deleted', // TODO
],
'import_export' => [ // TODO
'import_export' => [
'match_type' => 'Match Type [match_type] (Allowed values: exact, placeholders, regex)',
'category_id' => 'Category [category_id]',
'target_type' => 'Target Type [target_type] (Allowed values: path_or_url, cms_page, static_page, none)',
Expand All @@ -254,6 +275,9 @@
'to_date' => 'Scheduled date to [to_date] (YYYY-MM-DD or empty)',
'sort_order' => 'Priority [sort_order]',
'is_enabled' => 'Enabled [is_enabled] (1 = enable redirect, 0 = disable redirect [default])',
'ignore_query_parameters' => 'Ignore Query Parameters [ignore_query_parameters] (1 = yes, 0 = no [default])',
'ignore_case' => 'Ignore Case [ignore_case] (1 = yes, 0 = no [default])',
'ignore_trailing_slash' => 'Ignore Trailing Slashes [ignore_trailing_slash] (1 = yes, 0 = no [default])',
'test_lab' => 'Test Lab [test_lab] (1 = enable Test Lab, 0 = disable TestLab [default])',
'test_lab_path' => 'Test Lab path [test_lab_path] (required if match_type = placeholders)',
'system' => 'System [system] (1 = system generated redirect, 0 = user generated redirect [default])',
Expand Down
2 changes: 2 additions & 0 deletions updates/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@
- "Fixes issues with redirect rules file not being present -- See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/2.5.1"
2.5.2:
- "Fix bug that causes re-writing the redirect rules file when hits are updated -- See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/2.5.2"
2.5.3:
- "Improve / fixes redirect rule caching -- See: https://github.com/vdlp/oc-redirect-plugin/releases/tag/2.5.3"

0 comments on commit ea2c9ce

Please sign in to comment.