Original value display is broken

+++ b/config_translation.admin.incundefined
@@ -177,7 +177,6 @@ function config_translation_item_translate_page($action, $base_path, $title, $na
-  config_translation_enter_context($language);
   return drupal_get_form('config_translation_form', $base_path, $title, $names, $language);
 }
 
@@ -220,6 +219,7 @@ function config_translation_form($form, &$form_state, $base_path, $title, $names

@@ -220,6 +219,7 @@ function config_translation_form($form, &$form_state, $base_path, $title, $names
       '#tree' => TRUE,
     );
     $base_config = config($name)->get();
+    config_translation_enter_context($language);
     $form[$id] += config_translation_build_form(config_typed()->get($name), config($name)->get(), $base_config);

How does this solve the problem? The form has values and source intertwined, so I'd assumed entering / leaving contexts constantly would be what is needed here, or keeping a previously retrieved $config around, if that would work. Just putting the context entering later sounds like would not actually solve this? How does it do it?

+++ b/config_translation.admin.incundefined
@@ -299,12 +299,12 @@ function config_translation_build_form($schema, $config, $base_config, $collapse
-        '#description' => $description,
+        '#description' => $description

This trailing comma should be no issue, it should even be there according to the coding standards.

Starting to look good :)

+++ b/config_translation.admin.incundefined
@@ -176,9 +176,13 @@ function config_translation_item_translate_page($action, $base_path, $title, $na
+  // Get base language configuration, before form building.
+  $base_config = array();
+  foreach ($names as $name) {
+    $base_config[$name] = config($name)->get();

It would be great to add a comment here on why is this being done. :)

+++ b/config_translation.admin.incundefined
@@ -196,11 +200,13 @@ function config_translation_item_translate_page($action, $base_path, $title, $na
+ * @param array $base_config
+ *   An array of base language configuration data.

"keyed by configuration names" would be a good addition to the docs.

Superb, thanks, let's get this committed :)

Superb, thanks!

As per YesCT, this is not yet fixed. We'll also need tests for this.

Good catch on the issue where the config page is visited in another language :)

Test only should fail :D

Test-only patch should still fail :D I think I found the reason it does not.

+++ b/lib/Drupal/config_translation/Tests/ConfigTranslationUITest.phpundefined
@@ -99,13 +101,18 @@ class ConfigTranslationUITest extends WebTestBase {
+
+    // Visit French site to ensure base language string present as source.
+    $this->drupalGet($translation_base_url . '/edit/fr');
+    $this->assertText($site_name);
+    $this->assertText($site_slogan);

This just visits the French translation editing page, but the page is not in French. That would need a path prefix of 'fr'. $translation_base_url starts with 'admin/...'.

So drupalget('fr/' . $translation_base_url . '/edit/fr') I think :)

Thanks! Committed the fix with updated code comments. It is not the base context but the override free context + other updates to the comments around contexts to make this easier to understand. Woot!

http://drupalcode.org/project/config_translation.git/commitdiff/8a09f89f...