From 75746e15880c72487864ed62b860052eedc224b6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 4 Jul 2016 15:22:05 +0200
Subject: [translation] Improve module list; move baseconfig hook to
 baseconfig_bwlp

---
 .../baseconfig/hooks/translation.inc.php           | 39 ----------------------
 modules-available/baseconfig_bwlp/config.json      |  3 ++
 .../baseconfig_bwlp/hooks/translation.inc.php      | 39 ++++++++++++++++++++++
 modules-available/translation/page.inc.php         | 16 ++++++---
 .../translation/templates/module-list.html         |  7 +++-
 5 files changed, 59 insertions(+), 45 deletions(-)
 delete mode 100644 modules-available/baseconfig/hooks/translation.inc.php
 create mode 100644 modules-available/baseconfig_bwlp/config.json
 create mode 100644 modules-available/baseconfig_bwlp/hooks/translation.inc.php

(limited to 'modules-available')

diff --git a/modules-available/baseconfig/hooks/translation.inc.php b/modules-available/baseconfig/hooks/translation.inc.php
deleted file mode 100644
index 7588fe38..00000000
--- a/modules-available/baseconfig/hooks/translation.inc.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-$HANDLER = array();
-
-/**
- * List of valid subsections
- */
-$HANDLER['subsections'] = array(
-	'config-variable-categories', 'config-variables'
-);
-
-/*
- * Handlers for the subsections that will return an array of expected tags.
- * This is optional, if you don't want to define expected tags, don't create a function.
- */
-
-/**
- * Configuration categories
- */
-$HANDLER['grep_config-variable-categories'] = function($module) {
-	$module->activate();
-	$want = BaseConfigUtil::getCategories();
-	foreach ($want as &$entry) {
-		$entry = true;
-	}
-	return $want;
-};
-
-/**
- * Configuration variables
- */
-$HANDLER['grep_config-variables'] = function($module) {
-	$module->activate();
-	$want = BaseConfigUtil::getVariables();
-	foreach ($want as &$entry) {
-		$entry = true;
-	}
-	return $want;
-};
diff --git a/modules-available/baseconfig_bwlp/config.json b/modules-available/baseconfig_bwlp/config.json
new file mode 100644
index 00000000..af67a188
--- /dev/null
+++ b/modules-available/baseconfig_bwlp/config.json
@@ -0,0 +1,3 @@
+{
+	"dependencies": ["baseconfig"]
+}
diff --git a/modules-available/baseconfig_bwlp/hooks/translation.inc.php b/modules-available/baseconfig_bwlp/hooks/translation.inc.php
new file mode 100644
index 00000000..7588fe38
--- /dev/null
+++ b/modules-available/baseconfig_bwlp/hooks/translation.inc.php
@@ -0,0 +1,39 @@
+<?php
+
+$HANDLER = array();
+
+/**
+ * List of valid subsections
+ */
+$HANDLER['subsections'] = array(
+	'config-variable-categories', 'config-variables'
+);
+
+/*
+ * Handlers for the subsections that will return an array of expected tags.
+ * This is optional, if you don't want to define expected tags, don't create a function.
+ */
+
+/**
+ * Configuration categories
+ */
+$HANDLER['grep_config-variable-categories'] = function($module) {
+	$module->activate();
+	$want = BaseConfigUtil::getCategories();
+	foreach ($want as &$entry) {
+		$entry = true;
+	}
+	return $want;
+};
+
+/**
+ * Configuration variables
+ */
+$HANDLER['grep_config-variables'] = function($module) {
+	$module->activate();
+	$want = BaseConfigUtil::getVariables();
+	foreach ($want as &$entry) {
+		$entry = true;
+	}
+	return $want;
+};
diff --git a/modules-available/translation/page.inc.php b/modules-available/translation/page.inc.php
index 74cf27a8..563ffae0 100644
--- a/modules-available/translation/page.inc.php
+++ b/modules-available/translation/page.inc.php
@@ -593,20 +593,26 @@ class Page_Translation extends Page
 
 	private function checkModuleTranslation($module)
 	{
-		$tags = $this->loadUsedTemplateTags($module);
+		$templateTags = $this->loadUsedTemplateTags($module);
+		$messageTags = $this->loadUsedMessageTags($module);
+		$moduleTags = $this->loadUsedModuleTags($module);
 		$msgs = '';
 		foreach (Dictionary::getLanguages() as $lang) {
-			list($missing, $unused) = $this->getModuleTemplateStatus($lang, $tags, $module);
+			list($m1, $u1) = $this->getModuleTemplateStatus($lang, $templateTags, $module);
+			list($m2, $u2) = $this->getModuleTranslationStatus($lang, 'messages', true, $messageTags, $module);
+			list($m3, $u3) = $this->getModuleTranslationStatus($lang, 'module', true, $moduleTags, $module);
+			$missing = $m1 + $m2 + $m3;
+			$unused = $u1 + $u2 + $u3;
 
 			$msg = "";
 			if ($missing > 0) {
-				$msg .= " [$missing JSON tag(s) are missing] ";
+				$msg .= " [$missing missing] ";
 			}
 			if ($unused > 0) {
-				$msg .= " [$unused JSON tag(s) are not being used] ";
+				$msg .= " [$unused not being used] ";
 			}
 			if(!empty($msg)) {
-				$msgs .= "<div><div class='pull-left'><div class='badge'>$lang</div></div> $msg<div class='clearfix'></div></div>";
+				$msgs .= '<div><div class="pull-left">' . Dictionary::getFlagHtml(false, $lang) . '</div>' . $msg . '<div class="clearfix"></div></div>';
 			}
 		}
 		if(empty($msgs)) {
diff --git a/modules-available/translation/templates/module-list.html b/modules-available/translation/templates/module-list.html
index 81dc741c..026e17e9 100644
--- a/modules-available/translation/templates/module-list.html
+++ b/modules-available/translation/templates/module-list.html
@@ -11,7 +11,12 @@
 		<tbody>
 			{{#table}}
 				<tr>
-					<td><a href="?do=Translation&amp;module={{module}}">{{module}}</a></td>
+					<td>
+						{{#depfail}}
+						<div class="pull-right"><span class="red glyphicon glyphicon-exclamation-sign" title="{{lang_missingDeps}}"></span></div>
+						{{/depfail}}
+						<a href="?do=Translation&amp;module={{module}}">{{module}}</a>
+					</td>
 					<td>{{{status}}}</td>
 				</tr>
 			{{/table}}
-- 
cgit v1.2.3-55-g7522