diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install index 3a659ae..11d1873 100644 --- a/core/modules/locale/locale.install +++ b/core/modules/locale/locale.install @@ -372,15 +372,15 @@ function locale_update_8004() { * structures handled in this update. */ function locale_update_8005() { - // Collect all lids that are sources to plural variants. + // Collect all LIDs that are sources to plural variants. $results = db_query("SELECT lid, plid FROM {locales_target} WHERE plural <> 0"); $plural_lids = array(); foreach ($results as $row) { - // Need to collect both lid and plid. The lid for the first (singular) - // string can only be retrieved from the first plural's plid given no + // Need to collect both LID and PLID. The LID for the first (singular) + // string can only be retrieved from the first plural's PLID given no // other indication. The last plural variant is never referenced, so we - // need to store the lid directly for that. We never know whether we are - // on the last plural though, so we always remember lid too. + // need to store the LID directly for that. We never know whether we are + // on the last plural though, so we always remember LID too. $plural_lids[] = $row->lid; $plural_lids[] = $row->plid; } @@ -409,13 +409,14 @@ function locale_update_8005() { } else { // Children strings point to their utmost parents. Because we get data - // in plid order, we can ensure that all previous parents have data now, + // in PLID order, we can ensure that all previous parents have data now, // so we can just copy the parent's data about their parent, etc. $parents_to_sources[$child->lid] = $parents_to_sources[$child->plid]; // Append translation to the utmost parent's translation string. $utmost_parent = &$strings[$child->language][$parents_to_sources[$child->plid]]; - // Drop the Drupal specific numbering scheme from the end of plural formulas. + // Drop the Drupal-specific numbering scheme from the end of plural + // formulas. $utmost_parent['translation'][] = str_replace('@count[' . $child->plural .']', '@count', $child->translation); if (count($utmost_parent['source']) < 2) { // Append source to the utmost parent's source string only if it is the @@ -424,8 +425,8 @@ function locale_update_8005() { $utmost_parent['source'][] = $child->source; } - // All plural variant lids are to be removed with their translations. - // Only the singular lids will be kept. + // All plural variant LIDs are to be removed with their translations. + // Only the singular LIDs will be kept. $remove_lids[] = $child->lid; } } @@ -457,9 +458,9 @@ function locale_update_8005() { } } - // Remove all plural lids from source and target, only keep ones which - // were originally used for the singular strings (now updated to contain - // the serialized version of plurals). + // Remove all plural LIDs from source and target. only keep those which were + // originally used for the singular strings (now updated to contain the + // serialized version of plurals). $remove_lids = array_unique($remove_lids); db_delete('locales_source') ->condition('lid', $remove_lids, 'IN') diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 177b79f..0d59f42 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -369,7 +369,7 @@ function locale_translate_edit_form($form, &$form_state, $lid) { } } else { - // Fallback for unknow number of plurals. + // Fallback for unknown number of plurals. $form['translations'][$langcode][0] = array( '#type' => 'textarea', '#title' => t('Sigular form'),