diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/forum/forum.module | 6 | ||||
| -rw-r--r-- | modules/locale/locale.module | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module index c815d697a..dcb2f9f85 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -505,9 +505,9 @@ function forum_form_main($type, $edit = array()) { */ function forum_form_forum($edit = array()) { $edit += array( - 'name' => '', - 'description' => '', - 'tid' => NULL, + 'name' => '', + 'description' => '', + 'tid' => NULL, 'weight' => 0, ); $form['name'] = array('#type' => 'textfield', diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 745dc5e31..c3856f947 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -34,6 +34,7 @@ function locale_help($section) { return '<p>'. t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the <a href=\"@url\">Drupal translation page</a>. Note that importing a translation file might take a while.", array('@url' => 'http://drupal.org/project/translations')) .'</p>'; case 'admin/build/locale/language/export': return '<p>'. t("This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.") .'</p>'; + case 'admin/build/locale/string': case 'admin/build/locale/string/search': return '<p>'. t("It is often convenient to get the strings from your setup on the <a href=\"@export\">export page</a>, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.", array("@export" => url("admin/build/locale/language/export"))) .'</p>'; case 'admin/build/locale/language/configure': @@ -315,11 +316,19 @@ function locale_language_name($lang) { * @param $field * 'name' => names in current language, localized * 'native' => native names + * @param $all + * Boolean to return all languages or only enabled ones */ -function locale_language_list($field = 'name') { - $languages = language_list('enabled'); +function locale_language_list($field = 'name', $all = FALSE) { + if ($all) { + $languages = language_list(); + } + else { + $languages = language_list('enabled'); + $languages = $languages[1]; + } $list = array(); - foreach($languages[1] as $language) { + foreach($languages as $language) { $list[$language->language] = ($field == 'name') ? t($language->name) : $language->$field; } return $list; |