Part of #1971384: [META] Convert page callbacks to controllers

For instructions on how to convert a page callback into a controller, see the WSCCI Conversion Guide.

to test:

  1. install (in english)
  2. install language module and interface translation module
  3. visit admin/reports/translations
  4. add a couple languages
  5. visit admin/reports/translations again

also,

  1. try installing in another language, and then
  2. visit admin/reports/translations
  3. add a couple languages
  4. visit admin/reports/translations again
Files: 
CommentFileSizeAuthor
#61 locale-1978926-61.patch23.59 KBtim.plunkett
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 73,378 pass(es).
[ View ]
#61 interdiff.txt1.65 KBtim.plunkett
#59 interdiff.txt8.02 KBkim.pepper
#59 1978926-local-translation-status-59.patch22.14 KBkim.pepper
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 72,845 pass(es).
[ View ]
#56 interdiff.txt11.05 KBkim.pepper
#56 1978926-local-translation-status-56.patch29.5 KBkim.pepper
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 72,752 pass(es).
[ View ]
#52 locale-update_status_form-1978926-48-52.txt1.07 KBlikin
#52 locale-update_status_form-1978926-52.patch22.24 KBlikin
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 71,680 pass(es), 1 fail(s), and 1 exception(s).
[ View ]
#48 interdiff-47-48.txt887 bytesYesCT
#48 locale-update_status_form-1978926-48-just42withtestandremovedexportwrapper-withfix.patch22.31 KBYesCT
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,431 pass(es).
[ View ]
#48 interdiff-48-fix.txt741 bytesYesCT
#48 locale-update_status_form-1978926-48-just42withtestandremovedexportwrapper.patch22.33 KBYesCT
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,398 pass(es), 1 fail(s), and 0 exception(s).
[ View ]
#48 interdiff-42-48-testandremovedexportwrapper.txt1.46 KBYesCT
#1 locale_translation_status_form_controller-1978926-1.patch7.76 KBPancho
FAILED: [[SimpleTest]]: [MySQL] 56,605 pass(es), 51 fail(s), and 0 exception(s).
[ View ]
#2 locale_translation_status_form_controller-1978926-2.patch14.93 KBPancho
FAILED: [[SimpleTest]]: [MySQL] 56,924 pass(es), 43 fail(s), and 5 exception(s).
[ View ]
#5 interdiff-1978926-2-5.txt11.84 KBPancho
#5 locale_translation_status_form_controller-1978926-5.patch19.14 KBPancho
FAILED: [[SimpleTest]]: [MySQL] 56,774 pass(es), 40 fail(s), and 0 exception(s).
[ View ]
#10 drupal-locale_translation_status_form_controller-1978926-10.patch19.42 KBh3rj4n
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]
#11 drupal-locale_translation_status_form_controller-1978926-11.patch19.46 KBh3rj4n
FAILED: [[SimpleTest]]: [MySQL] 57,961 pass(es), 4 fail(s), and 0 exception(s).
[ View ]
#18 interdiff.txt16.98 KBdisasm
#18 drupal8.locale-module.1978926-18.patch22.26 KBdisasm
FAILED: [[SimpleTest]]: [MySQL] 59,275 pass(es), 3 fail(s), and 0 exception(s).
[ View ]
#22 interdiff.txt7.33 KBLuxian
#22 drupal.locale.update_form_status-1978926-22.patch22.39 KBLuxian
FAILED: [[SimpleTest]]: [MySQL] Unable to apply patch drupal.locale.update_form_status-1978926-22.patch. Unable to apply patch. See the log in the details link for more information.
[ View ]
#26 locale_improved.patch13.15 KBneetu morwani
FAILED: [[SimpleTest]]: [MySQL] 61,470 pass(es), 1,725 fail(s), and 801 exception(s).
[ View ]
#28 locale-update_status_form-1978926-28.patch22.29 KBlikin
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 66,613 pass(es), 46 fail(s), and 16 exception(s).
[ View ]
#28 locale-update_status_form-1978926-22-28.txt814 byteslikin
#30 locale-update_status_form-1978926-30.patch22.26 KBlikin
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 66,731 pass(es), 3 fail(s), and 0 exception(s).
[ View ]
#30 locale-update_status_form-1978926-28-30.txt1.44 KBlikin
#33 locale-update_status_form-1978926-33.patch22.26 KBlikin
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 66,821 pass(es).
[ View ]
#33 locale-update_status_form-1978926-30-33.txt832 byteslikin
#34 locale-update_status_form-1978926-34.patch22.28 KBYesCT
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 69,570 pass(es), 46 fail(s), and 16 exception(s).
[ View ]
#40 locale-update_status_form-1978926-34-40.txt1.38 KBlikin
#40 locale-update_status_form-1978926-40.patch22.18 KBlikin
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 69,587 pass(es).
[ View ]
#42 translationupdatestatus.png192.5 KBYesCT
#42 withpatchnolanguages.png138.3 KBYesCT
#42 interdiff-1978926-40-42.txt582 bytesYesCT
#42 locale-update_status_form-1978926-42.patch22.2 KBYesCT
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,575 pass(es).
[ View ]
#46 locale-update_status_form-1978926-46.patch21.52 KBlikin
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,650 pass(es).
[ View ]
#46 locale-update_status_form-1978926-42-46.txt2.43 KBlikin
#47 locale-update_status_form-1978926-47.patch22.87 KBlikin
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,621 pass(es).
[ View ]
#47 locale-update_status_form-1978926-42-46.txt2.43 KBlikin
#47 locale-update_status_form-1978926-46-47.txt1.81 KBlikin

Comments

Pancho’s picture

Status:Active» Needs review
Issue tags:+D8MI, +WSCCI-conversion
StatusFileSize
new7.76 KB
FAILED: [[SimpleTest]]: [MySQL] 56,605 pass(es), 51 fail(s), and 0 exception(s).
[ View ]

Quite straightforward, but I didn't get to testing it that much.
So let's see what the bot says and then please review.

Pancho’s picture

StatusFileSize
new14.93 KB
FAILED: [[SimpleTest]]: [MySQL] 56,924 pass(es), 43 fail(s), and 5 exception(s).
[ View ]

Sorry, the first patch was missing our new class. No other changes.
Here we go again:

Pancho’s picture

Assigned:Unassigned» Pancho

Status:Needs review» Needs work

The last submitted patch, locale_translation_status_form_controller-1978926-2.patch, failed testing.

Pancho’s picture

Status:Needs work» Needs review
StatusFileSize
new11.84 KB
new19.14 KB
FAILED: [[SimpleTest]]: [MySQL] 56,774 pass(es), 40 fail(s), and 0 exception(s).
[ View ]

New patch:

  • Use 'locale_translation_status_form' as FormID, so the form is correctly recognized for theming
  • Roll in _locale_translation_status_debug_info() as TranslationStatusForm::createInfoString()
  • Swap out the quite complex data shuffling to TranslationStatusForm::prepareUpdateData()
  • Remove the unused $projects variable with it's call to locale_translation_get_projects()
  • Inject the module handler.
  • Some minor optimizations.

Now let's see what the testbot says.
In any case still open for further improvements, optimizations and suggestions.

Status:Needs review» Needs work
Issue tags:-D8MI, -FormInterface, -WSCCI-conversion

The last submitted patch, locale_translation_status_form_controller-1978926-5.patch, failed testing.

Pancho’s picture

Status:Needs work» Needs review

#5: locale_translation_status_form_controller-1978926-5.patch queued for re-testing.

Previous result: FAILED: [[SimpleTest]]: [MySQL] Repository checkout: failed to checkout from [git://git.drupal.org/project/drupal.git].

Status:Needs review» Needs work
Issue tags:+D8MI, +FormInterface, +WSCCI-conversion

The last submitted patch, locale_translation_status_form_controller-1978926-5.patch, failed testing.

h3rj4n’s picture

Assigned:Pancho» h3rj4n

taking over the issue.

h3rj4n’s picture

StatusFileSize
new19.42 KB
FAILED: [[SimpleTest]]: [MySQL] Setup environment: Test cancelled by admin prior to completion.
[ View ]

This patch is definitely going to fail but the old one couldn't be applied, so just created a new one.

h3rj4n’s picture

StatusFileSize
new19.46 KB
FAILED: [[SimpleTest]]: [MySQL] 57,961 pass(es), 4 fail(s), and 0 exception(s).
[ View ]

Ok, I hope this one doesn't fail. Should all be fixed.

h3rj4n’s picture

Status:Needs work» Needs review

Forgot 'needs review' again :S

Status:Needs review» Needs work

The last submitted patch, drupal-locale_translation_status_form_controller-1978926-11.patch, failed testing.

h3rj4n’s picture

quick update: The locale module requires the update module to be enabled. Otherwise this module doesn't work. It's about this function locale_translation_build_projects. It works but won't give you the functionality you want.

jair’s picture

Issue tags:+Needs reroll
xjm’s picture

Thanks for your work on this issue! Please see #1971384-43: [META] Convert page callbacks to controllers for an update on the routing system conversion process.

Gábor Hojtsy’s picture

Issue tags:+language-ui
disasm’s picture

Assigned:h3rj4n» disasm
Status:Needs work» Needs review
StatusFileSize
new16.98 KB
new22.26 KB
FAILED: [[SimpleTest]]: [MySQL] 59,275 pass(es), 3 fail(s), and 0 exception(s).
[ View ]

massive reroll. Built on FormBase. Injecting KeyVaueStoreInterface to get rid of Drupal::state(). Compared functions being replaced with methods and made changes accordingly. Not throwing any errors locally. Lets see what testbot thinks!

disasm’s picture

Noting that if anything looks odd in the interdiff (like removing locale_translation_manual_status), that isn't really happening. It was a screw-up I made in the reroll somehow that I fixed in my commit (in the reroll I ended up with two locale_translation_manual_status functions, one of which contained the stuff I really wanted to remove.

Status:Needs review» Needs work

The last submitted patch, drupal8.locale-module.1978926-18.patch, failed testing.

Luxian’s picture

Assigned:disasm» Luxian

@disasm Your patch looks really good and I would like to continue your work and try to get all the Locale forms converted. The other forms already have a working patch:

So, I will assign this to me.

Luxian’s picture

Status:Needs work» Needs review
StatusFileSize
new7.33 KB
new22.39 KB
FAILED: [[SimpleTest]]: [MySQL] Unable to apply patch drupal.locale.update_form_status-1978926-22.patch. Unable to apply patch. See the log in the details link for more information.
[ View ]

This is the patch from #1978926-18: Convert locale_translation_status_form to a Controller re-rolled with conflicts resolved. I have 3 tests failing on my local. I'm not sure how much time I will have in the next 2 days, so if anyone wants to work on it can assign it to himself.

Interdiff might be wrong (not sure if I do them right).

The last submitted patch, drupal.locale.update_form_status-1978926-22.patch, failed testing.

artem.ua’s picture

Status:Needs work» Needs review

Status:Needs review» Needs work

The last submitted patch, 22: drupal.locale.update_form_status-1978926-22.patch, failed testing.

neetu morwani’s picture

Issue summary:View changes
Status:Needs work» Needs review
StatusFileSize
new13.15 KB
FAILED: [[SimpleTest]]: [MySQL] 61,470 pass(es), 1,725 fail(s), and 801 exception(s).
[ View ]

Last patch re-rolled. Now the patch applies successfully.

Status:Needs review» Needs work

The last submitted patch, 26: locale_improved.patch, failed testing.

likin’s picture

Status:Needs work» Needs review
StatusFileSize
new22.29 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 66,613 pass(es), 46 fail(s), and 16 exception(s).
[ View ]
new814 bytes

Status:Needs review» Needs work

The last submitted patch, 28: locale-update_status_form-1978926-28.patch, failed testing.

likin’s picture

Assigned:Luxian» Unassigned
Status:Needs work» Needs review
StatusFileSize
new22.26 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 66,731 pass(es), 3 fail(s), and 0 exception(s).
[ View ]
new1.44 KB

Status:Needs review» Needs work

The last submitted patch, 30: locale-update_status_form-1978926-30.patch, failed testing.

ehegedus’s picture

Issue tags:-Needs reroll

It still applies, tag removed.

likin’s picture

Status:Needs work» Needs review
StatusFileSize
new22.26 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 66,821 pass(es).
[ View ]
new832 bytes
-        if (!isset($project_info->type)) {
+        if (empty($project_info->type)) {

if it is a class. It always have to have an attribute.

YesCT’s picture

StatusFileSize
new22.28 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 69,570 pass(es), 46 fail(s), and 16 exception(s).
[ View ]

was going to review this, but it did not apply.
rerolled.
easy, auto 3-way merge.
no conflicts. (no interdiff)

I'll review this now.

tim.plunkett’s picture

Status:Needs review» Needs work
+++ 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');
+  }
+

Bad merge? It's supposed to be removing the other one.

likin’s picture

@tim.plunkett This is from
https://drupal.org/node/1978924. It is a pitty that it has been closed automaticaly due to no activity. We need an authorized person to solve such problems. There are a lot rtbc tasks.

likin’s picture

Status:Needs work» Needs review

After this issue and the issue https://drupal.org/node/1978918 are commited we need remove a file that realizes \Drupal\locale\Form\LocaleForm because its unuseless. So we need commit at the first.

likin’s picture

Status:Needs review» Reviewed & tested by the community

Status:Reviewed & tested by the community» Needs work

The last submitted patch, 34: locale-update_status_form-1978926-34.patch, failed testing.

likin’s picture

StatusFileSize
new1.38 KB
new22.18 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 69,587 pass(es).
[ View ]
likin’s picture

Status:Needs work» Needs review

I've corrected variable definitions.

YesCT’s picture

Issue summary:View changes
Issue tags:+Needs tests
Parent issue:» #1971384: [META] Convert page callbacks to controllers
StatusFileSize
new192.5 KB
new138.3 KB
new582 bytes
new22.2 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,575 pass(es).
[ View ]

1.

+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslationStatusForm.php
@@ -0,0 +1,298 @@
+ * {@inheritdoc}
+ */
+class TranslationStatusForm extends FormBase {
+  /**

we dont use inheritdoc on classes.

fixing that.

--------notes
at first I tried something like find . -name "*.php" | xargs awk '/inheritdoc/,/function/' > /tmp/results.txt
but could not get that to work, so instead did a bit of manual work and did
ag inheritdoc -A 2 > /tmp/results.txt
then
ag class -A 2 /tmp/results.txt
and looked through those results.
#2250165: Replace fake mocks with actual OpenDialogCommand stubs in AjaxCommandsTest opened to take care of that.
--------end notes

2.
also fixing nit of missing newline after open { of the class.
"Leave an empty line between start of class/interface definition and property/method definition:"
https://drupal.org/node/608152#indenting

3.
either this issue, or a separate issue needs to add tests for this form/table.

because with this patch, the table at admin/reports/translations
should show

but it shows

Status:Needs review» Needs work

The last submitted patch, 42: locale-update_status_form-1978926-42.patch, failed testing.

YesCT’s picture

Status:Needs work» Needs review
likin’s picture

likin’s picture

StatusFileSize
new21.52 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,650 pass(es).
[ View ]
new2.43 KB

I've corrected the dunctionality according to snapshots #42, removed extra code according to #35. The test is defined for but it does not cover on fully Drupal\locale\Tests\LocaleUpdateTest::testUpdateCheckStatus()

I tried

<?php
// Case when contributed modules are absent.
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Missing translations for one project'));
?>

But it crashes tests because because this page caches some settings.

likin’s picture

StatusFileSize
new22.87 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,621 pass(es).
[ View ]
new2.43 KB
new1.81 KB
YesCT’s picture

StatusFileSize
new1.46 KB
new22.33 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,398 pass(es), 1 fail(s), and 0 exception(s).
[ View ]
new741 bytes
new22.31 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 70,431 pass(es).
[ View ]
new887 bytes

I haven't checked for all the forms this effects and tried them all manually. We might still want to do that.

But there was a line in #47 I didn't understand why was added.
So, what I did was take 42, and add the test (from 47, but only part of 47) and take out the export wrapper.
This had 1 fail (agreeing with 42 3.) Good! Uploading that to show the test works (fails).
Then I added the fix from #46.

I talked with @likin in irc, but I still dont understand #46

But it crashes tests because because this page caches some settings.

Maybe #2264027: Refactoring locale_translation_get_status will clarify?

taking the needs tests tag off since the only problem spotted so far, has had a assert added for it.

We might want to keep an eye on this, as in the future, when adding a language, core should be able to get the translation automatically. But we dont need to worry about that here, because now we have a test that will fail when that does begin to work, and that issue can update this test.

likin’s picture

The patch from the comment 47 has passed tests succussfuly. So It was a temporary fail. We can close the task #2264027: Refactoring locale_translation_get_status. I hope this task is ready to be commited. :) Tasks appear these modify the logic. So we need finish the convertion and continue the logic modification later.

penyaskito’s picture

+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslationStatusForm.php
@@ -0,0 +1,299 @@
+    $this->moduleHandler->loadInclude('locale', 'translation.inc');
+    $this->moduleHandler->loadInclude('locale', 'compare.inc');

Are these included in any other forms? Should we make those services? I guess old-style includes are not good, but this can be done in follow-up.

Otherwise, looks good. I will proceed with manual testing if noone beats me to do it.

likin’s picture

StatusFileSize
new22.24 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 71,680 pass(es), 1 fail(s), and 1 exception(s).
[ View ]
new1.07 KB

It is modified according to #51

rodrigoaguilera’s picture

I've done the manual testing according to the issue summary and everything looks alright to me.

rodrigoaguilera’s picture

Status:Needs review» Reviewed & tested by the community

Status:Reviewed & tested by the community» Needs work

The last submitted patch, 52: locale-update_status_form-1978926-52.patch, failed testing.

kim.pepper’s picture

Status:Needs work» Needs review
StatusFileSize
new29.5 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 72,752 pass(es).
[ View ]
new11.05 KB

I've re-rolled for PSR4 and made some code-style clean ups.

This issue is pretty old, so there may be a few other cleanups needed.

Tests are passing locally.

kim.pepper’s picture

tim.plunkett’s picture

+++ b/core/modules/locale/src/Tests/LocaleUpdateTest.php
@@ -126,12 +143,12 @@ function testUpdateCheckStatus() {
-  function testUpdateImportSourceRemote() {
+  public function testUpdateImportSourceRemote() {
     $config = \Drupal::config('locale.settings');

     // Build the test environment.
     $this->setTranslationFiles();
-    $this-> setCurrentTranslations();
+    $this->setCurrentTranslations();
     $config->set('translation.default_filename', '%project-%version.%language._po');

     // Set the update conditions for this test.
@@ -188,12 +205,12 @@ function testUpdateImportSourceRemote() {

@@ -188,12 +205,12 @@ function testUpdateImportSourceRemote() {
    *  - Source: local files only
    *  - Import overwrite: all existing translations
    */
-  function testUpdateImportSourceLocal() {
+  public function testUpdateImportSourceLocal() {
     $config = \Drupal::config('locale.settings');

     // Build the test environment.
     $this->setTranslationFiles();
-    $this-> setCurrentTranslations();
+    $this->setCurrentTranslations();
     $config->set('translation.default_filename', '%project-%version.%language._po');

     // Set the update conditions for this test.
@@ -242,12 +259,12 @@ function testUpdateImportSourceLocal() {

@@ -242,12 +259,12 @@ function testUpdateImportSourceLocal() {
    *  - Source: remote and local files
    *  - Import overwrite: only overwrite non-customized translations
    */
-  function testUpdateImportModeNonCustomized() {
+  public function testUpdateImportModeNonCustomized() {
     $config = \Drupal::config('locale.settings');

     // Build the test environment.
     $this->setTranslationFiles();
-    $this-> setCurrentTranslations();
+    $this->setCurrentTranslations();
     $config->set('translation.default_filename', '%project-%version.%language._po');

     // Set the test conditions.
@@ -278,12 +295,12 @@ function testUpdateImportModeNonCustomized() {

@@ -278,12 +295,12 @@ function testUpdateImportModeNonCustomized() {
    *  - Source: remote and local files
    *  - Import overwrite: don't overwrite any existing translation
    */
-  function testUpdateImportModeNone() {
+  public function testUpdateImportModeNone() {
     $config = \Drupal::config('locale.settings');

     // Build the test environment.
     $this->setTranslationFiles();
-    $this-> setCurrentTranslations();
+    $this->setCurrentTranslations();
     $config->set('translation.default_filename', '%project-%version.%language._po');

     // Set the test conditions.
@@ -310,7 +327,7 @@ function testUpdateImportModeNone() {

@@ -310,7 +327,7 @@ function testUpdateImportModeNone() {
   /**
    * Tests automatic translation import when a module is enabled.
    */
-  function testEnableUninstallModule() {
+  public function testEnableUninstallModule() {
     // Make the hidden test modules look like a normal custom module.
     \Drupal::state()->set('locale.test_system_info_alter', TRUE);

@@ -325,7 +342,11 @@ function testEnableUninstallModule() {

@@ -325,7 +342,11 @@ function testEnableUninstallModule() {

     // Check if translations have been imported.
     $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
-      array('%number' => 7, '%update' => 0, '%delete' => 0)), 'One translation file imported.');
+      array(
+        '%number' => 7,
+        '%update' => 0,
+        '%delete' => 0,
+      )), 'One translation file imported.');
     $this->assertTranslation('Tuesday', 'Dienstag', 'de');

     $edit = array(
@@ -348,7 +369,7 @@ function testEnableUninstallModule() {

@@ -348,7 +369,7 @@ function testEnableUninstallModule() {
    * enabled modules and will import them. When a language is removed the system
    * will remove all translations of that langugue from the database.
    */
-  function testEnableLanguage() {
+  public function testEnableLanguage() {
     // Make the hidden test modules look like a normal custom module.
     \Drupal::state()->set('locale.test_system_info_alter', TRUE);

@@ -370,7 +391,11 @@ function testEnableLanguage() {

@@ -370,7 +391,11 @@ function testEnableLanguage() {

     // Check if the right number of translations are added.
     $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
-      array('%number' => 8, '%update' => 0, '%delete' => 0)), 'One language added.');
+      array(
+        '%number' => 8,
+        '%update' => 0,
+        '%delete' => 0,
+      )), 'One language added.');
     $this->assertTranslation('Extraday', 'extra dag', 'nl');

     // Check if the language data is added to the database.
@@ -392,7 +417,7 @@ function testEnableLanguage() {

@@ -392,7 +417,7 @@ function testEnableLanguage() {
   /**
    * Tests automatic translation import when a custom langauge is added.
    */
-  function testEnableCustomLanguage() {
+  public function testEnableCustomLanguage() {

Is *any* of this in scope?
Otherwise the rest looks good.

kim.pepper’s picture

StatusFileSize
new22.14 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 72,845 pass(es).
[ View ]
new8.02 KB

Sorry! Got a bit excited with reformatting.

This reverts code style cleanups @tim.plunkett mentions in #58

tim.plunkett’s picture

Status:Needs review» Reviewed & tested by the community

Excellent, thanks!

tim.plunkett’s picture

Status:Reviewed & tested by the community» Needs review
StatusFileSize
new1.65 KB
new23.59 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 73,378 pass(es).
[ View ]

Actually, too soon. Deleted some stale code.

jibran’s picture

Status:Needs review» Reviewed & tested by the community

Back to RTBC

Gábor Hojtsy’s picture

Issue tags:+sprint

Yay, thanks!

Status:Reviewed & tested by the community» Needs work

The last submitted patch, 61: locale-1978926-61.patch, failed testing.

Status:Needs work» Needs review
tim.plunkett’s picture

Status:Needs review» Reviewed & tested by the community

EntityCrudHookTest has been randomly failing all day :(

alexpott’s picture

Status:Reviewed & tested by the community» Fixed

Committed 8b45d21 and pushed to 8.x. Thanks!

diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 68870ee..82506d7 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -5,7 +5,6 @@
  * Interface translation summary, editing and deletion user interfaces.
  */

-use Drupal\Component\Utility\String;
use Drupal\Core\Render\Element;
use Drupal\locale\SourceString;
use Drupal\locale\TranslationString;
@@ -92,6 +91,8 @@ function theme_locale_translate_edit_form_strings($variables) {
  *   An associative array containing:
  *   - updates: The projects which have updates.
  *   - not_found: The projects which updates are not found.
+ *
+ * @see \Drupal\locale\Form\TranslationStatusForm
  */
function template_preprocess_locale_translation_update_info(&$variables) {
   $details = array();
@@ -148,6 +149,8 @@ function template_preprocess_locale_translation_update_info(&$variables) {
  * @param $variables
  *   An associative array containing:
  *   - last: The timestamp when the site last checked for available updates.
+ *
+ * @see \Drupal\locale\Form\TranslationStatusForm
  */
function template_preprocess_locale_translation_last_check(&$variables) {
   $last = $variables['last'];
diff --git a/core/modules/locale/src/Form/TranslationStatusForm.php b/core/modules/locale/src/Form/TranslationStatusForm.php
index 74bff5c..a1c7e34 100644
--- a/core/modules/locale/src/Form/TranslationStatusForm.php
+++ b/core/modules/locale/src/Form/TranslationStatusForm.php
@@ -267,7 +267,7 @@ protected function createInfoString($project_info) {
   public function validateForm(array &$form, array &$form_state) {
     // Check if a language has been selected. 'tableselect' doesn't.
     if (!array_filter($form_state['values']['langcodes'])) {
-      form_set_error('', $this->t('Select a language to update.'));
+      $this->setFormError('', $this->t('Select a language to update.'));
     }
   }

Minor fixes on commit.

  • alexpott committed 8b45d21 on 8.x
    Issue #1978926 by likin, YesCT, Pancho, kim.pepper, h3rj4n, tim.plunkett...
Gábor Hojtsy’s picture

Issue tags:-sprint

Yay, thanks!

Status:Fixed» Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.