Move some locale updates to update.inc for a safe language upgrade. [#1809962]

When running the D8 upgrade in a language other than English, the locale system is used, which includes locale string tables. So we need to move corresponding updates to locale.inc (update_prepare_d8_language)

Actually, this was causing a lot of issues with this patch, which atm needs some hacking around locale queries for the update process not to crash #1785086: Introduce a generic API for interface translation strings
(Which means if we fix this one, that queries could be simplified.)

This is a very small and straight forward patch, most of the lines are renumbering the other locale updates.

Comment	File	Size	Author
#3	drupal8.locale-update.3.patch	1.65 KB	sun
#3
	locale_update_tables-01.patch	3.52 KB	Jose Reyero

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

Gábor Hojtsy

he/him

Hungarian

Hungary

CreditAttribution: Gábor Hojtsy commented 11 October 2012 at 14:25

Status:	Needs review	» Reviewed & tested by the community
Issue tags:		+D8MI

Looks very simple and straightforward. Should be RTBC if comes back green. It will fire it to needs work automatically otherwise :)

Comment #2

sun

German

Karlsruhe

CreditAttribution: sun commented 11 October 2012 at 14:41

Status:

Reviewed & tested by the community

» Needs work

+++ b/core/includes/update.inc
@@ -399,6 +399,20 @@ function update_prepare_d8_language() {
+    // Since updating in a language other than English will trigger the locale
+    // translation system, we need to take care of locale tables here.
+    if (db_table_exists('locales_target')) {
+      // Add column to track customized string status to locales_target.
...
+      db_add_field('locales_target', 'customized', $customized_spec);

1) Let's add a !db_field_exists() condition after the db_table_exists() condition.

2) The second comment should actually come first, and it looks like we can combine and shorten the first into it then.

+++ b/core/includes/update.inc
@@ -399,6 +399,20 @@ function update_prepare_d8_language() {
+      $customized_spec = array(
+          'type' => 'int',

1) Why is this $customized_spec vs. just $spec?

2) Too much indentation?

+++ b/core/modules/locale/locale.install
@@ -513,24 +513,11 @@ function locale_update_8005() {
-function locale_update_8006() {

@@ -734,7 +721,7 @@ function locale_update_8011() {
-function locale_update_8013() {
+function locale_update_8011() {

Let's just remove the update 8006 without renumbering, please.

Comment #3

sun

German

Karlsruhe

CreditAttribution: sun commented 11 October 2012 at 14:55

Status:

Needs work

» Needs review

File	Size
drupal8.locale-update.3.patch	1.65 KB

Comment #4

Gábor Hojtsy

he/him

Hungarian

Hungary

CreditAttribution: Gábor Hojtsy commented 11 October 2012 at 14:59

Status:

Needs review

» Reviewed & tested by the community

I think we want to renumber updates instead of leaving holes, but I'm fine either way, if this is preferred. It does not matter as long as the main bug is fixed, which the update patch still does. Thanks!

Comment #5

webchick

she/they

English

Vancouver 🇨🇦

CreditAttribution: webchick commented 11 October 2012 at 21:49

Category:	feature	» task
Status:	Reviewed & tested by the community	» Fixed

I think the hole is probably fine for now; most likely we'll do a big round of update clean-up before beta.

Confirmed that this matches the schema defined in locale_schema(), so committed and pushed to 8.x. Thanks!

Comment #6

sun

German

Karlsruhe

CreditAttribution: sun commented 12 October 2012 at 16:18

As this in #2 showed:

-function locale_update_8013() {
+function locale_update_8011() {

There was a hole before this patch already.

There's nothing wrong with removing updates. Renumbering the others only causes havoc - especially for sites that are running on HEAD already - for absolutely no reason, other than pedantic silliness of "But 2 comes after 1!". We should stop renumbering updates.