Преглед изворни кода

Update Languages to v3 (#56)

added support to display translation status
Mafoo пре 8 година
родитељ
комит
30d42e315d
4 измењених фајлова са 157 додато и 16 уклоњено
  1. 1 1
      languages/app_config.php
  2. 126 2
      languages/app_languages.php
  3. 23 6
      languages/index.php
  4. 7 7
      languages/languages_compare.php

+ 1 - 1
languages/app_config.php

@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "23ecb350-b423-428d-9a8d-d617d27b30fe";
 		$apps[$x]['category'] = "System";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "2";
+		$apps[$x]['version'] = "3";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "A tool to analyze languages used in the GUI following https://msdn.microsoft.com/en-gb/library/ee825488%28v=cs.20%29.aspx";

+ 126 - 2
languages/app_languages.php

@@ -1,11 +1,14 @@
 <?php
-#This file was last reorganized on 18th of May 2017 10:30:21 AM UTC
+#This file was last reorganized on 2nd of June 2017 04:38:28 PM UTC
 
 $text['description-compare_languages']['en-us'] = "Compare languages between different cultures";
 $text['description-compare_languages']['ar-eg'] = "";
 $text['description-compare_languages']['de-at'] = "";
+$text['description-compare_languages']['de-ch'] = "";
 $text['description-compare_languages']['de-de'] = "";
 $text['description-compare_languages']['es-cl'] = "";
+$text['description-compare_languages']['es-mx'] = "";
+$text['description-compare_languages']['fr-ca'] = "";
 $text['description-compare_languages']['fr-fr'] = "";
 $text['description-compare_languages']['he-il'] = "";
 $text['description-compare_languages']['it-it'] = "";
@@ -13,6 +16,7 @@ $text['description-compare_languages']['nl-nl'] = "";
 $text['description-compare_languages']['pl-pl'] = "";
 $text['description-compare_languages']['pt-br'] = "";
 $text['description-compare_languages']['pt-pt'] = "";
+$text['description-compare_languages']['ro-ro'] = "";
 $text['description-compare_languages']['ru-ru'] = "";
 $text['description-compare_languages']['sv-se'] = "";
 $text['description-compare_languages']['uk-ua'] = "";
@@ -20,8 +24,11 @@ $text['description-compare_languages']['uk-ua'] = "";
 $text['description-languages']['en-us'] = "Languages listed below are managed in /resources/app_languages.php";
 $text['description-languages']['ar-eg'] = "";
 $text['description-languages']['de-at'] = "";
+$text['description-languages']['de-ch'] = "";
 $text['description-languages']['de-de'] = "";
 $text['description-languages']['es-cl'] = "";
+$text['description-languages']['es-mx'] = "";
+$text['description-languages']['fr-ca'] = "";
 $text['description-languages']['fr-fr'] = "";
 $text['description-languages']['he-il'] = "";
 $text['description-languages']['it-it'] = "";
@@ -29,6 +36,7 @@ $text['description-languages']['nl-nl'] = "";
 $text['description-languages']['pl-pl'] = "";
 $text['description-languages']['pt-br'] = "";
 $text['description-languages']['pt-pt'] = "";
+$text['description-languages']['ro-ro'] = "";
 $text['description-languages']['ru-ru'] = "";
 $text['description-languages']['sv-se'] = "";
 $text['description-languages']['uk-ua'] = "";
@@ -36,8 +44,11 @@ $text['description-languages']['uk-ua'] = "";
 $text['description-reference_language']['en-us'] = "Language to use for reference of missing text";
 $text['description-reference_language']['ar-eg'] = "";
 $text['description-reference_language']['de-at'] = "";
+$text['description-reference_language']['de-ch'] = "";
 $text['description-reference_language']['de-de'] = "";
 $text['description-reference_language']['es-cl'] = "";
+$text['description-reference_language']['es-mx'] = "";
+$text['description-reference_language']['fr-ca'] = "";
 $text['description-reference_language']['fr-fr'] = "";
 $text['description-reference_language']['he-il'] = "";
 $text['description-reference_language']['it-it'] = "";
@@ -45,6 +56,7 @@ $text['description-reference_language']['nl-nl'] = "";
 $text['description-reference_language']['pl-pl'] = "";
 $text['description-reference_language']['pt-br'] = "";
 $text['description-reference_language']['pt-pt'] = "";
+$text['description-reference_language']['ro-ro'] = "";
 $text['description-reference_language']['ru-ru'] = "";
 $text['description-reference_language']['sv-se'] = "";
 $text['description-reference_language']['uk-ua'] = "";
@@ -52,8 +64,11 @@ $text['description-reference_language']['uk-ua'] = "";
 $text['description-target_language']['en-us'] = "Language to compare";
 $text['description-target_language']['ar-eg'] = "";
 $text['description-target_language']['de-at'] = "";
+$text['description-target_language']['de-ch'] = "";
 $text['description-target_language']['de-de'] = "";
 $text['description-target_language']['es-cl'] = "";
+$text['description-target_language']['es-mx'] = "";
+$text['description-target_language']['fr-ca'] = "";
 $text['description-target_language']['fr-fr'] = "";
 $text['description-target_language']['he-il'] = "";
 $text['description-target_language']['it-it'] = "";
@@ -61,6 +76,7 @@ $text['description-target_language']['nl-nl'] = "";
 $text['description-target_language']['pl-pl'] = "";
 $text['description-target_language']['pt-br'] = "";
 $text['description-target_language']['pt-pt'] = "";
+$text['description-target_language']['ro-ro'] = "";
 $text['description-target_language']['ru-ru'] = "";
 $text['description-target_language']['sv-se'] = "";
 $text['description-target_language']['uk-ua'] = "";
@@ -68,8 +84,11 @@ $text['description-target_language']['uk-ua'] = "";
 $text['header-compare_languages']['en-us'] = "Select Languages";
 $text['header-compare_languages']['ar-eg'] = "";
 $text['header-compare_languages']['de-at'] = "";
+$text['header-compare_languages']['de-ch'] = "";
 $text['header-compare_languages']['de-de'] = "";
 $text['header-compare_languages']['es-cl'] = "";
+$text['header-compare_languages']['es-mx'] = "";
+$text['header-compare_languages']['fr-ca'] = "";
 $text['header-compare_languages']['fr-fr'] = "";
 $text['header-compare_languages']['he-il'] = "";
 $text['header-compare_languages']['it-it'] = "";
@@ -77,6 +96,7 @@ $text['header-compare_languages']['nl-nl'] = "";
 $text['header-compare_languages']['pl-pl'] = "";
 $text['header-compare_languages']['pt-br'] = "";
 $text['header-compare_languages']['pt-pt'] = "";
+$text['header-compare_languages']['ro-ro'] = "";
 $text['header-compare_languages']['ru-ru'] = "";
 $text['header-compare_languages']['sv-se'] = "";
 $text['header-compare_languages']['uk-ua'] = "";
@@ -84,8 +104,11 @@ $text['header-compare_languages']['uk-ua'] = "";
 $text['header-language_results']['en-us'] = "Language results";
 $text['header-language_results']['ar-eg'] = "";
 $text['header-language_results']['de-at'] = "";
+$text['header-language_results']['de-ch'] = "";
 $text['header-language_results']['de-de'] = "";
 $text['header-language_results']['es-cl'] = "";
+$text['header-language_results']['es-mx'] = "";
+$text['header-language_results']['fr-ca'] = "";
 $text['header-language_results']['fr-fr'] = "";
 $text['header-language_results']['he-il'] = "";
 $text['header-language_results']['it-it'] = "";
@@ -93,6 +116,7 @@ $text['header-language_results']['nl-nl'] = "";
 $text['header-language_results']['pl-pl'] = "";
 $text['header-language_results']['pt-br'] = "";
 $text['header-language_results']['pt-pt'] = "";
+$text['header-language_results']['ro-ro'] = "";
 $text['header-language_results']['ru-ru'] = "";
 $text['header-language_results']['sv-se'] = "";
 $text['header-language_results']['uk-ua'] = "";
@@ -100,8 +124,11 @@ $text['header-language_results']['uk-ua'] = "";
 $text['label-app_target']['en-us'] = "Application";
 $text['label-app_target']['ar-eg'] = "";
 $text['label-app_target']['de-at'] = "";
+$text['label-app_target']['de-ch'] = "";
 $text['label-app_target']['de-de'] = "";
 $text['label-app_target']['es-cl'] = "";
+$text['label-app_target']['es-mx'] = "";
+$text['label-app_target']['fr-ca'] = "";
 $text['label-app_target']['fr-fr'] = "";
 $text['label-app_target']['he-il'] = "";
 $text['label-app_target']['it-it'] = "";
@@ -109,15 +136,79 @@ $text['label-app_target']['nl-nl'] = "";
 $text['label-app_target']['pl-pl'] = "";
 $text['label-app_target']['pt-br'] = "";
 $text['label-app_target']['pt-pt'] = "";
+$text['label-app_target']['ro-ro'] = "";
 $text['label-app_target']['ru-ru'] = "";
 $text['label-app_target']['sv-se'] = "";
 $text['label-app_target']['uk-ua'] = "";
 
+$text['label-translations']['en-us'] = "Translations";
+$text['label-translations']['ar-eg'] = "";
+$text['label-translations']['de-at'] = "";
+$text['label-translations']['de-ch'] = "";
+$text['label-translations']['de-de'] = "";
+$text['label-translations']['es-cl'] = "";
+$text['label-translations']['es-mx'] = "";
+$text['label-translations']['fr-ca'] = "";
+$text['label-translations']['fr-fr'] = "";
+$text['label-translations']['he-il'] = "";
+$text['label-translations']['it-it'] = "";
+$text['label-translations']['nl-nl'] = "";
+$text['label-translations']['pl-pl'] = "";
+$text['label-translations']['pt-br'] = "";
+$text['label-translations']['pt-pt'] = "";
+$text['label-translations']['ro-ro'] = "";
+$text['label-translations']['ru-ru'] = "";
+$text['label-translations']['sv-se'] = "";
+$text['label-translations']['uk-ua'] = "";
+
+$text['label-menu_items']['en-us'] = "Menu Items";
+$text['label-menu_items']['ar-eg'] = "";
+$text['label-menu_items']['de-at'] = "";
+$text['label-menu_items']['de-ch'] = "";
+$text['label-menu_items']['de-de'] = "";
+$text['label-menu_items']['es-cl'] = "";
+$text['label-menu_items']['es-mx'] = "";
+$text['label-menu_items']['fr-ca'] = "";
+$text['label-menu_items']['fr-fr'] = "";
+$text['label-menu_items']['he-il'] = "";
+$text['label-menu_items']['it-it'] = "";
+$text['label-menu_items']['nl-nl'] = "";
+$text['label-menu_items']['pl-pl'] = "";
+$text['label-menu_items']['pt-br'] = "";
+$text['label-menu_items']['pt-pt'] = "";
+$text['label-menu_items']['ro-ro'] = "";
+$text['label-menu_items']['ru-ru'] = "";
+$text['label-menu_items']['sv-se'] = "";
+$text['label-menu_items']['uk-ua'] = "";
+
+$text['label-app_descriptions']['en-us'] = "App Descriptions";
+$text['label-app_descriptions']['ar-eg'] = "";
+$text['label-app_descriptions']['de-at'] = "";
+$text['label-app_descriptions']['de-ch'] = "";
+$text['label-app_descriptions']['de-de'] = "";
+$text['label-app_descriptions']['es-cl'] = "";
+$text['label-app_descriptions']['es-mx'] = "";
+$text['label-app_descriptions']['fr-ca'] = "";
+$text['label-app_descriptions']['fr-fr'] = "";
+$text['label-app_descriptions']['he-il'] = "";
+$text['label-app_descriptions']['it-it'] = "";
+$text['label-app_descriptions']['nl-nl'] = "";
+$text['label-app_descriptions']['pl-pl'] = "";
+$text['label-app_descriptions']['pt-br'] = "";
+$text['label-app_descriptions']['pt-pt'] = "";
+$text['label-app_descriptions']['ro-ro'] = "";
+$text['label-app_descriptions']['ru-ru'] = "";
+$text['label-app_descriptions']['sv-se'] = "";
+$text['label-app_descriptions']['uk-ua'] = "";
+
 $text['label-culture_code']['en-us'] = "Culture Code";
 $text['label-culture_code']['ar-eg'] = "";
 $text['label-culture_code']['de-at'] = "";
+$text['label-culture_code']['de-ch'] = "";
 $text['label-culture_code']['de-de'] = "";
 $text['label-culture_code']['es-cl'] = "";
+$text['label-culture_code']['es-mx'] = "";
+$text['label-culture_code']['fr-ca'] = "";
 $text['label-culture_code']['fr-fr'] = "";
 $text['label-culture_code']['he-il'] = "";
 $text['label-culture_code']['it-it'] = "";
@@ -125,6 +216,7 @@ $text['label-culture_code']['nl-nl'] = "";
 $text['label-culture_code']['pl-pl'] = "";
 $text['label-culture_code']['pt-br'] = "";
 $text['label-culture_code']['pt-pt'] = "";
+$text['label-culture_code']['ro-ro'] = "";
 $text['label-culture_code']['ru-ru'] = "";
 $text['label-culture_code']['sv-se'] = "";
 $text['label-culture_code']['uk-ua'] = "";
@@ -132,8 +224,11 @@ $text['label-culture_code']['uk-ua'] = "";
 $text['label-flag']['en-us'] = "Flag";
 $text['label-flag']['ar-eg'] = "";
 $text['label-flag']['de-at'] = "";
+$text['label-flag']['de-ch'] = "";
 $text['label-flag']['de-de'] = "";
 $text['label-flag']['es-cl'] = "";
+$text['label-flag']['es-mx'] = "";
+$text['label-flag']['fr-ca'] = "";
 $text['label-flag']['fr-fr'] = "";
 $text['label-flag']['he-il'] = "";
 $text['label-flag']['it-it'] = "";
@@ -141,6 +236,7 @@ $text['label-flag']['nl-nl'] = "";
 $text['label-flag']['pl-pl'] = "";
 $text['label-flag']['pt-br'] = "";
 $text['label-flag']['pt-pt'] = "";
+$text['label-flag']['ro-ro'] = "";
 $text['label-flag']['ru-ru'] = "";
 $text['label-flag']['sv-se'] = "";
 $text['label-flag']['uk-ua'] = "";
@@ -148,8 +244,11 @@ $text['label-flag']['uk-ua'] = "";
 $text['label-reference_language']['en-us'] = "Reference Language";
 $text['label-reference_language']['ar-eg'] = "";
 $text['label-reference_language']['de-at'] = "";
+$text['label-reference_language']['de-ch'] = "";
 $text['label-reference_language']['de-de'] = "";
 $text['label-reference_language']['es-cl'] = "";
+$text['label-reference_language']['es-mx'] = "";
+$text['label-reference_language']['fr-ca'] = "";
 $text['label-reference_language']['fr-fr'] = "";
 $text['label-reference_language']['he-il'] = "";
 $text['label-reference_language']['it-it'] = "";
@@ -157,6 +256,7 @@ $text['label-reference_language']['nl-nl'] = "";
 $text['label-reference_language']['pl-pl'] = "";
 $text['label-reference_language']['pt-br'] = "";
 $text['label-reference_language']['pt-pt'] = "";
+$text['label-reference_language']['ro-ro'] = "";
 $text['label-reference_language']['ru-ru'] = "";
 $text['label-reference_language']['sv-se'] = "";
 $text['label-reference_language']['uk-ua'] = "";
@@ -164,8 +264,11 @@ $text['label-reference_language']['uk-ua'] = "";
 $text['label-tag']['en-us'] = "Tag";
 $text['label-tag']['ar-eg'] = "";
 $text['label-tag']['de-at'] = "";
+$text['label-tag']['de-ch'] = "";
 $text['label-tag']['de-de'] = "";
 $text['label-tag']['es-cl'] = "";
+$text['label-tag']['es-mx'] = "";
+$text['label-tag']['fr-ca'] = "";
 $text['label-tag']['fr-fr'] = "";
 $text['label-tag']['he-il'] = "";
 $text['label-tag']['it-it'] = "";
@@ -173,6 +276,7 @@ $text['label-tag']['nl-nl'] = "";
 $text['label-tag']['pl-pl'] = "";
 $text['label-tag']['pt-br'] = "";
 $text['label-tag']['pt-pt'] = "";
+$text['label-tag']['ro-ro'] = "";
 $text['label-tag']['ru-ru'] = "";
 $text['label-tag']['sv-se'] = "";
 $text['label-tag']['uk-ua'] = "";
@@ -180,8 +284,11 @@ $text['label-tag']['uk-ua'] = "";
 $text['label-target_language']['en-us'] = "Target Language";
 $text['label-target_language']['ar-eg'] = "";
 $text['label-target_language']['de-at'] = "";
+$text['label-target_language']['de-ch'] = "";
 $text['label-target_language']['de-de'] = "";
 $text['label-target_language']['es-cl'] = "";
+$text['label-target_language']['es-mx'] = "";
+$text['label-target_language']['fr-ca'] = "";
 $text['label-target_language']['fr-fr'] = "";
 $text['label-target_language']['he-il'] = "";
 $text['label-target_language']['it-it'] = "";
@@ -189,6 +296,7 @@ $text['label-target_language']['nl-nl'] = "";
 $text['label-target_language']['pl-pl'] = "";
 $text['label-target_language']['pt-br'] = "";
 $text['label-target_language']['pt-pt'] = "";
+$text['label-target_language']['ro-ro'] = "";
 $text['label-target_language']['ru-ru'] = "";
 $text['label-target_language']['sv-se'] = "";
 $text['label-target_language']['uk-ua'] = "";
@@ -196,8 +304,11 @@ $text['label-target_language']['uk-ua'] = "";
 $text['title-compare_languages']['en-us'] = "Compare Languages";
 $text['title-compare_languages']['ar-eg'] = "";
 $text['title-compare_languages']['de-at'] = "";
+$text['title-compare_languages']['de-ch'] = "";
 $text['title-compare_languages']['de-de'] = "";
 $text['title-compare_languages']['es-cl'] = "";
+$text['title-compare_languages']['es-mx'] = "";
+$text['title-compare_languages']['fr-ca'] = "";
 $text['title-compare_languages']['fr-fr'] = "";
 $text['title-compare_languages']['he-il'] = "";
 $text['title-compare_languages']['it-it'] = "";
@@ -205,6 +316,7 @@ $text['title-compare_languages']['nl-nl'] = "";
 $text['title-compare_languages']['pl-pl'] = "";
 $text['title-compare_languages']['pt-br'] = "";
 $text['title-compare_languages']['pt-pt'] = "";
+$text['title-compare_languages']['ro-ro'] = "";
 $text['title-compare_languages']['ru-ru'] = "";
 $text['title-compare_languages']['sv-se'] = "";
 $text['title-compare_languages']['uk-ua'] = "";
@@ -212,8 +324,11 @@ $text['title-compare_languages']['uk-ua'] = "";
 $text['title-languages']['en-us'] = "Languages";
 $text['title-languages']['ar-eg'] = "";
 $text['title-languages']['de-at'] = "";
+$text['title-languages']['de-ch'] = "";
 $text['title-languages']['de-de'] = "";
 $text['title-languages']['es-cl'] = "";
+$text['title-languages']['es-mx'] = "";
+$text['title-languages']['fr-ca'] = "";
 $text['title-languages']['fr-fr'] = "";
 $text['title-languages']['he-il'] = "";
 $text['title-languages']['it-it'] = "";
@@ -221,6 +336,7 @@ $text['title-languages']['nl-nl'] = "";
 $text['title-languages']['pl-pl'] = "";
 $text['title-languages']['pt-br'] = "";
 $text['title-languages']['pt-pt'] = "";
+$text['title-languages']['ro-ro'] = "";
 $text['title-languages']['ru-ru'] = "";
 $text['title-languages']['sv-se'] = "";
 $text['title-languages']['uk-ua'] = "";
@@ -228,8 +344,11 @@ $text['title-languages']['uk-ua'] = "";
 $text['warning-global_already_defined']['en-us'] = "Global already defines this text as ";
 $text['warning-global_already_defined']['ar-eg'] = "";
 $text['warning-global_already_defined']['de-at'] = "";
+$text['warning-global_already_defined']['de-ch'] = "";
 $text['warning-global_already_defined']['de-de'] = "";
 $text['warning-global_already_defined']['es-cl'] = "";
+$text['warning-global_already_defined']['es-mx'] = "";
+$text['warning-global_already_defined']['fr-ca'] = "";
 $text['warning-global_already_defined']['fr-fr'] = "";
 $text['warning-global_already_defined']['he-il'] = "";
 $text['warning-global_already_defined']['it-it'] = "";
@@ -237,6 +356,7 @@ $text['warning-global_already_defined']['nl-nl'] = "";
 $text['warning-global_already_defined']['pl-pl'] = "";
 $text['warning-global_already_defined']['pt-br'] = "";
 $text['warning-global_already_defined']['pt-pt'] = "";
+$text['warning-global_already_defined']['ro-ro'] = "";
 $text['warning-global_already_defined']['ru-ru'] = "";
 $text['warning-global_already_defined']['sv-se'] = "";
 $text['warning-global_already_defined']['uk-ua'] = "";
@@ -244,8 +364,11 @@ $text['warning-global_already_defined']['uk-ua'] = "";
 $text['warning-incorrect_language_culture_code']['en-us'] = "the language culture code does not follow the normal format see - ";
 $text['warning-incorrect_language_culture_code']['ar-eg'] = "";
 $text['warning-incorrect_language_culture_code']['de-at'] = "";
+$text['warning-incorrect_language_culture_code']['de-ch'] = "";
 $text['warning-incorrect_language_culture_code']['de-de'] = "";
 $text['warning-incorrect_language_culture_code']['es-cl'] = "";
+$text['warning-incorrect_language_culture_code']['es-mx'] = "";
+$text['warning-incorrect_language_culture_code']['fr-ca'] = "";
 $text['warning-incorrect_language_culture_code']['fr-fr'] = "";
 $text['warning-incorrect_language_culture_code']['he-il'] = "";
 $text['warning-incorrect_language_culture_code']['it-it'] = "";
@@ -253,8 +376,9 @@ $text['warning-incorrect_language_culture_code']['nl-nl'] = "";
 $text['warning-incorrect_language_culture_code']['pl-pl'] = "";
 $text['warning-incorrect_language_culture_code']['pt-br'] = "";
 $text['warning-incorrect_language_culture_code']['pt-pt'] = "";
+$text['warning-incorrect_language_culture_code']['ro-ro'] = "";
 $text['warning-incorrect_language_culture_code']['ru-ru'] = "";
 $text['warning-incorrect_language_culture_code']['sv-se'] = "";
 $text['warning-incorrect_language_culture_code']['uk-ua'] = "";
 
-?>
+?>

+ 23 - 6
languages/index.php

@@ -36,18 +36,25 @@ require_once "resources/require.php";
 		exit;
 	}
 
+	if (count($_POST) > 0) {
+		//set the variables
+			$detect_all_languages = check_str($_POST["detect_all_languages"]);
+	}
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
+	$language_totals = $language->language_totals();
+
+	if($detect_all_languages){
+		$language->detect_all_languages(true);
+		messages::add("Detected all Languages");
+	}
 
 //additional includes
 	require_once "resources/header.php";
 	require_once "resources/paging.php";
 
-//get variables used to control the order
-	$order_by = $_GET["order_by"];
-	$order = $_GET["order"];
-
 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
@@ -61,13 +68,20 @@ require_once "resources/require.php";
 	echo "	</tr>\n";
 	echo "</table>\n";
 
+	echo "<form method='post' name='frm' action=''>\n";
+	echo "    <button type='submit' id='organize_app' name='detect_all_languages' value='1'>Detect all languages</button>\n";
+	echo "</form>\n";
+
 
 //table headers
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<th nowrap='' style='width:2em'>".$text['label-flag']."</th>\n";
-	echo th_order_by('language_code', $text['label-culture_code'], $order_by, $order, '', "style='width:4em;'");
-	echo th_order_by('language_name', $text['label-name'], $order_by, $order);
+	echo "<th nowrap='' style='width:4em'>".$text['label-culture_code']."</th>\n";
+	echo "<th nowrap='' style='width:4em'>".$text['label-translations']."</th>\n";
+	echo "<th nowrap='' style='width:4em'>".$text['label-menu_items']."</th>\n";
+	echo "<th nowrap='' style='width:4em'>".$text['label-app_descriptions']."</th>\n";
+	echo "<th nowrap=''>".$text['label-name']."</th>\n";
 	echo "</tr>\n";
 
 	$c = 0;
@@ -83,6 +97,9 @@ require_once "resources/require.php";
 			echo "$nbsp;<sup>*1</sup>";
 		}
 		echo "</td>";
+		echo "<td class='row_style".($c%2)."'".($language_totals['languages'][$lang_code] == $language_totals['languages']['total'] ? " style='color:#00DD00'" : '').">".sprintf("%.1f%%", $language_totals['languages'][$lang_code] / $language_totals['languages']['total'] * 100 )."</td>";
+		echo "<td class='row_style".($c%2)."'".($language_totals['menu_items'][$lang_code] == $language_totals['menu_items']['total'] ? " style='color:#00DD00'" : '').">".sprintf("%.1f%%", $language_totals['menu_items'][$lang_code] / $language_totals['menu_items']['total'] * 100 )."</td>";
+		echo "<td class='row_style".($c%2)."'".($language_totals['app_descriptions'][$lang_code] == $language_totals['app_descriptions']['total'] ? " style='color:#00DD00'" : '').">".sprintf("%.1f%%", $language_totals['app_descriptions'][$lang_code] / $language_totals['app_descriptions']['total'] * 100 )."</td>";
 		echo "<td class='row_style".($c%2)."'>".$text["language-$lang_code"]."</td>";
 		echo "</tr>\n";
 		$c++;

+ 7 - 7
languages/languages_compare.php

@@ -49,9 +49,11 @@ require_once "resources/require.php";
 			$organize_all = check_str($_POST["organize_all"]);
 	}
 
-//collect languages
+//add multi-lingual support
 	$language = new text;
+	$text = $language->get();
 
+//collect languages
 	$language_text = $language->get('all', $app_target, true);
 	foreach ($language_text as $lang_label => $lang_codes) {
 		$language_labels[] = $lang_label;
@@ -65,24 +67,22 @@ require_once "resources/require.php";
 	}
 	unset($language_text);
 
-//add multi-lingual support
-	$text = $language->get();
-
 	if($organize_app and strlen($app_target) > 0) {
 		$language->organize_language($app_target, false);
 		messages::add("Updated $app_target's app_languages.php");
 	}
 	if($organize_all) {
-		$files = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_languages.php");
+		$files = glob($_SERVER["PROJECT_ROOT"] . "/*/*/app_languages.php");
 		foreach($files as $file) {
 			$file = preg_replace('/\A.*(\/.*\/.*)\z/', '$1', dirname($file));
 			$language->organize_language($file, true);
 		}
+		$language->organize_language('resources', true);
 		messages::add("Updated All app_languages.php's");
 	}
 
 //get the list of installed apps from the core and mod directories
-	$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
+	$config_list = glob($_SERVER["PROJECT_ROOT"] . "/*/*/app_config.php");
 	$app_list;
 	$x=0;
 	foreach ($config_list as $config_path) {
@@ -94,7 +94,7 @@ require_once "resources/require.php";
 		$app_list[$app_name] = $app_path;
 		$x++;
 	}
-	$theme_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/themes/*/app_languages.php");
+	$theme_list = glob($_SERVER["PROJECT_ROOT"] . "/themes/*/app_languages.php");
 	foreach ($theme_list as $config_path) {
 		$dirs = explode("/", $config_path);
 		$app_path = $dirs[(sizeof($dirs)-3)] . "/" . $dirs[(sizeof($dirs)-2)];