There are still a few places in the code base where "translation" instead of "entity_translation". Moreover the integration with core Translation needs some additional change.

CommentFileSizeAuthor
#3 et-1060334-3.patch14.25 KBplach
#1 et-1060334-1.patch15.54 KBplach

Comments

plach’s picture

plach
he/him
Primary language Italian
Location Venezia
commented
Status: Active » Needs review
StatusFileSize
new et-1060334-1.patch15.54 KB

While fixing core translation integration I found a few easy-to-fix core bugs:

#1060304: Misleading help text for the translation support settings
#1060328: Removing a previously available language detection method breaks the configuration UI

and above all:

#1060246: Translation alters language switch links even if node translation is disabled

sun’s picture

sun
Primary language German
Location Karlsruhe
commented
Status: Needs review » Reviewed & tested by the community

Let's go ahead with these changes, except the following:

+++ entity_translation.module	13 Feb 2011 13:29:22 -0000
@@ -19,6 +19,18 @@ function entity_translation_language_typ
+function entity_translation_language_negotiation_info_alter(array &$language_providers) {
+  // Since content language is now configurable we do not need this provider
+  // anymore. As a matter of fact content language should become the main
+  // language type, since we tied Translation module to content language during
+  // installation. Interface language can just be configured the same as content
+  // language if they have to match.
+  unset($language_providers[LOCALE_LANGUAGE_NEGOTIATION_INTERFACE]);
+}

Hm. Not sure about this change. Is it wise to remove the default language negotiation provider? Perhaps we should discuss this some more.

+++ entity_translation.node.inc	13 Feb 2011 13:51:05 -0000
@@ -123,23 +131,29 @@ function entity_translation_node_view($n
+    $form['workflow']['language_content_type']['#options'][TRANSLATION_ENABLED] = t('Enabled, with node translation');
...
-  $form['workflow']['language_content_type']['#options'][TRANSLATION_ENABLED] = t('Enabled, with entity translation');
...
+  $form['workflow']['language_content_type']['#options'][ENTITY_TRANSLATION_ENABLED] = t('Enabled, with content translation');

"Node translation" and "Content translation" is a bit confusing. During migration and testing, I also renamed "content translation" into "entity translation".

I'd recommend to do this change in a separate issue - ideally the existing one that also talks about moving this setting into a new tab group.

Powered by Dreditor.

plach’s picture

plach
he/him
Primary language Italian
Location Venezia
commented
Status: Reviewed & tested by the community » Fixed
StatusFileSize
new et-1060334-3.patch14.25 KB

Committed the attached patch to HEAD.

Status: Fixed » Closed (fixed)

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

  • Commit 95b635b on master, et-permissions-1829630, factory, et-fc, revisions by plach: 
    #1060334 by plach: Completed the transition from Translation 2.

  • Commit 95b635b on master, et-permissions-1829630, factory, et-fc, revisions, workbench by plach: 
    #1060334 by plach: Completed the transition from Translation 2.