diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | includes/locale.inc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/includes/common.inc b/includes/common.inc index 9ef5e6d7b..6f348500b 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -997,7 +997,7 @@ function url($path = NULL, $query = NULL, $fragment = NULL, $absolute = FALSE) { // Apache. $script = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === false) ? 'index.php' : ''; } - + $path = drupal_get_path_alias($path); if (isset($fragment)) { diff --git a/includes/locale.inc b/includes/locale.inc index 8779a8c67..817839b1a 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -51,7 +51,7 @@ function _locale_admin_manage_screen() { $isdefault = $key; } if ($key == 'en') { - $form['name']['en'] = array(type => 'markup', value => check_plain($lang)); + $form['name']['en'] = array(type => 'markup', value => check_plain($lang)); } else { $original = db_fetch_object(db_query("SELECT COUNT(*) AS strings FROM {locales_source}")); @@ -66,7 +66,7 @@ function _locale_admin_manage_screen() { $form['enabled'] = array(type => 'checkboxes', options => $options, default_value => $enabled, return_value => 1); $form['sitedefault'] = array(type => 'radios', options => $options, default_value => $isdefault, return_value => 1); $form['submit'] = array(type => 'submit', value => t('Save configuration')); - + return drupal_get_form('_locale_admin_manage_screen', $form); } @@ -979,15 +979,15 @@ function _locale_string_edit($lid) { $form = array(); while ($translation = db_fetch_object($result)) { $orig = $translation->source; - $form[$translation->locale] = (strlen($orig) > 40) ? + $form[$translation->locale] = (strlen($orig) > 40) ? array(type => 'textarea', title => $languages['name'][$translation->locale], default_value => $translation->translation, cols => 60, rows => 15) : array(type => 'textfield', title => $languages['name'][$translation->locale], default_value => $translation->translation, size => 60, maxlength => 128); unset($languages['name'][$translation->locale]); } $form = array(type => 'item', title => t('Original text'), value => wordwrap(check_plain($orig, 0))); foreach ($languages['name'] as $key => $lang) { - $form[$key] = (strlen($orig) > 40) ? -array(type => 'textarea', title => $lang, cols => 60, rows => 15) : + $form[$key] = (strlen($orig) > 40) ? +array(type => 'textarea', title => $lang, cols => 60, rows => 15) : array(type => 'textfield', title => $lang, size => 60, maxlength => 128); } |