From 39b05037b24e3ada47248a7943aca7a9979048d3 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 19 Mar 2012 15:57:15 +0900
Subject: [PATCH] =?UTF-8?q?Issue=20#158803=20by=20clemens.tolboom,=20Sutha?=
=?UTF-8?q?rsan,=20G=C3=A1bor=20Hojtsy:=20Hide=20'Language'=20column=20in?=
=?UTF-8?q?=20content=20overview=20table=20if=20only=20one=20language=20is?=
=?UTF-8?q?=20enabled.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/includes/bootstrap.inc | 4 +++-
core/modules/node/node.admin.inc | 11 +++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 7869daa66779..49679910ec96 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2569,7 +2569,9 @@ function language_name($langcode) {
if ($language = language_load($langcode)) {
return $language->name;
}
-
+ if (empty($langcode)) {
+ return t('Unknown');
+ }
return t('Unknown (@langcode)', array('@langcode' => $langcode));
}
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index e5d6a151fcda..ac18da785eae 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -104,7 +104,7 @@ function node_filters() {
) + node_type_get_names(),
);
- // Language filter if the site is multilingual.
+ // Language filter if language support is present.
if (language_multilingual()) {
$languages = language_list(TRUE);
$language_options = array(LANGUAGE_NOT_SPECIFIED => t('- None -'));
@@ -431,9 +431,8 @@ function node_admin_nodes() {
'#submit' => array('node_admin_nodes_submit'),
);
- // Enable language column if translation module is enabled or if we have any
- // node with language.
- $multilanguage = (module_exists('translation') || db_query_range("SELECT 1 FROM {node} WHERE langcode <> :langcode", 0, 1, array(':langcode' => LANGUAGE_NOT_SPECIFIED))->fetchField());
+ // Enable language column and filter if multiple languages are enabled.
+ $multilingual = language_multilingual();
// Build the sortable table header.
$header = array(
@@ -443,7 +442,7 @@ function node_admin_nodes() {
'status' => array('data' => t('Status'), 'field' => 'n.status'),
'changed' => array('data' => t('Updated'), 'field' => 'n.changed', 'sort' => 'desc')
);
- if ($multilanguage) {
+ if ($multilingual) {
$header['language_name'] = array('data' => t('Language'), 'field' => 'n.langcode');
}
$header['operations'] = array('data' => t('Operations'));
@@ -495,7 +494,7 @@ function node_admin_nodes() {
'status' => $node->status ? t('published') : t('not published'),
'changed' => format_date($node->changed, 'short'),
);
- if ($multilanguage) {
+ if ($multilingual) {
$options[$node->nid]['language_name'] = language_name($node->langcode);
}
// Build a list of all the accessible operations for the current node.
--
GitLab