Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#206021 follow up by keith.smith, dropcube: better code comments in locale update

6.x
Gábor Hojtsy 2008-01-10 14:35:24 +00:00
parent b4520177fb
commit 58ad1fb2f4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/locale/locale.install
View File

@ -167,7 +167,7 @@ function locale_update_6004() {
*
* Use language_content_type_<content_type> instead of language_<content_type>
* so content types such as 'default', 'count' or 'negotiation' will not
* interfer with language variables.
* interfere with language variables.
*/
function locale_update_6005() {
foreach (node_get_types() as $type => $content_type) {
@ -181,8 +181,9 @@ function locale_update_6005() {
drupal_set_message('The default language setting has been reset to its default value. Check the '. l('language configuration page', 'admin/settings/language') .' to configure it correctly.');
}
elseif ($type == 'negotiation') {
// Either it is the negotiation setting or the content type setting, it
// is an integer. The language_negotiation setting is not reset, but
// language_content_type_negotiation is an integer either if it is
// the negotiation setting or the content type setting.
// The language_negotiation setting is not reset, but
// the user is alerted that this setting possibly was overwritten
variable_set('language_content_type_negotiation', $setting);
drupal_set_message('The language negotiation setting was possibly overwritten by a content type of the same name. Check the '. l('language configuration page', 'admin/settings/language/configure') .' and the '. l('<em>'. $content_type->name ."</em> content type's multilingual support settings", 'admin/content/types/negotiation', array('html' => TRUE)) .' to configure them correctly.');