diff --git a/locale-update_status_form-1978926-42.patch b/locale-update_status_form-1978926-46.patch index 04ce33f..a77becf 100644 --- a/locale-update_status_form-1978926-42.patch +++ b/locale-update_status_form-1978926-46.patch @@ -1,25 +1,6 @@ -diff --git a/core/modules/locale/lib/Drupal/locale/Form/LocaleForm.php b/core/modules/locale/lib/Drupal/locale/Form/LocaleForm.php -index 41857d0..7f720c6 100644 ---- a/core/modules/locale/lib/Drupal/locale/Form/LocaleForm.php -+++ b/core/modules/locale/lib/Drupal/locale/Form/LocaleForm.php -@@ -31,4 +31,14 @@ public function status() { - return \Drupal::formBuilder()->getForm('locale_translation_status_form'); - } - -+ /** -+ * Wraps locale_translate_export_form(). -+ * -+ * @todo Remove locale_translate_export_form(). -+ */ -+ public function export() { -+ module_load_include('bulk.inc', 'locale'); -+ return drupal_get_form('locale_translate_export_form'); -+ } -+ - } diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslationStatusForm.php b/core/modules/locale/lib/Drupal/locale/Form/TranslationStatusForm.php new file mode 100644 -index 0000000..2736f16 +index 0000000..180b49c --- /dev/null +++ b/core/modules/locale/lib/Drupal/locale/Form/TranslationStatusForm.php @@ -0,0 +1,299 @@ @@ -97,7 +78,7 @@ index 0000000..2736f16 + $this->moduleHandler->loadInclude('locale', 'compare.inc'); + + $languages = locale_translatable_language_list(); -+ $status = $this->state->get('locale.translation_status'); ++ $status = locale_translation_get_status(); + $options = array(); + $languages_update = array(); + $languages_not_found = array(); @@ -323,10 +304,10 @@ index 0000000..2736f16 + +} diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module -index afb4047..368aba8 100644 +index d3e05dc..74f04d8 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module -@@ -1366,3 +1366,19 @@ function _locale_rebuild_js($langcode = NULL) { +@@ -1367,3 +1367,19 @@ function _locale_rebuild_js($langcode = NULL) { return TRUE; } } @@ -586,7 +567,7 @@ index c35e33a..b07a0e3 100644 * * @param array $variables diff --git a/core/modules/locale/locale.routing.yml b/core/modules/locale/locale.routing.yml -index 6658dad..0869917 100644 +index a5703d8..9c3936c 100644 --- a/core/modules/locale/locale.routing.yml +++ b/core/modules/locale/locale.routing.yml @@ -40,7 +40,7 @@ locale.translate_export: