keys filters update from main dev

component/admin/config.xml

@@ -56,14 +56,6 @@
 			default="0644"
 			label="COM_LOCALISE_LABEL_SAVE_PERMISSION"
 			description="COM_LOCALISE_LABEL_SAVE_PERMISSION_DESC" />
-		<field
-			name="allowed_groups"
-			type="usergroup"
-			description="COM_LOCALISE_LABEL_ALLOWED_GROUPS_DESC"
-			label="COM_LOCALISE_LABEL_ALLOWED_GROUPS"
-			multiple="true"
-			size="10"
-			required="false" />
 		<field
 			name="installation"
 			type="folderlist"
@@ -79,6 +71,16 @@
 			default=".sys"
 			label="COM_LOCALISE_LABEL_SUFFIXES"
 			description="COM_LOCALISE_LABEL_SUFFIXES_DESC" />
+		<field
+			name="priority"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="0"
+			label="COM_LOCALISE_LABEL_PRIORITY"
+			description="COM_LOCALISE_LABEL_PRIORITY_DESC">
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
 		<field
 			name="clientID"
 			type="text"
@@ -128,35 +130,6 @@
 			label="COM_LOCALISE_LABEL_LICENSE"
 			description="COM_LOCALISE_LABEL_LICENSE_DESC" />
 	</fieldset>
-	<fieldset
-		name="specialkeys"
-		label="COM_LOCALISE_LABEL_SPECIAL_KEYS"
-		description="COM_LOCALISE_LABEL_SPECIAL_KEYS_DESC">
-		<field
-			name="untranslatablestrings"
-			type="textarea"
-			filter="raw"
-			default=""
-			label="COM_LOCALISE_LABEL_STRINGS_SAME"
-			description="COM_LOCALISE_LABEL_STRINGS_SAME_DESC" />
-
-		<field
-			name="blockedstrings"
-			type="textarea"
-			filter="raw"
-			default=""
-			label="COM_LOCALISE_LABEL_STRINGS_TO_PROTECT"
-			description="COM_LOCALISE_LABEL_STRINGS_TO_PROTECT_DESC" />
-
-		<field
-			name="keystokeep"
-			type="textarea"
-			filter="raw"
-			default=""
-			label="COM_LOCALISE_LABEL_KEYS_TO_KEEP"
-			description="COM_LOCALISE_LABEL_KEYS_TO_KEEP_DESC" />
-
-	</fieldset>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"

component/admin/helpers/localise.php

@@ -515,11 +515,14 @@ public static function isCorePackage($path)
 	 */
 	public static function findTranslationPath($client, $tag, $filename)
 	{
-		$path = static::getTranslationPath($client, $tag, $filename, 'local');
+		$params = JComponentHelper::getParams('com_localise');
+		$priority = $params->get('priority', '0') == '0' ? 'global' : 'local';
+		$path = static::getTranslationPath($client, $tag, $filename, $priority);
 
 		if (!is_file($path))
 		{
-			$path = static::getTranslationPath($client, $tag, $filename, 'global');
+			$priority = $params->get('priority', '0') == '0' ? 'local' : 'global';
+			$path = static::getTranslationPath($client, $tag, $filename, $priority);
 		}
 
 		return $path;
@@ -589,7 +592,7 @@ public static function getTranslationPath($client, $tag, $filename, $storage)
 
 					if (!is_file($path))
 					{
-						$path = $client == 'administrator' ? LOCALISEPATH_SITE : LOCALISE_ADMINISTRATOR . "/language/$tag/$tag.$filename.ini";
+						$path = $client == 'administrator' ? LOCALISEPATH_SITE : LOCALISEPATH_ADMINISTRATOR . "/language/$tag/$tag.$filename.ini";
 					}
 
 					break;

component/admin/language/en-GB/en-GB.com_localise.ini

@@ -41,34 +41,26 @@ INSTALLATION="Installation"
 COM_LOCALISE_CONFIG_GLOBAL_DESC="The reference language displays the value of the original string. Default is en-GB."
 COM_LOCALISE_CONFIG_GLOBAL_LABEL="Global configuration"
 COM_LOCALISE_CONFIGURATION="Localise configuration"
+COM_LOCALISE_LABEL_REFERENCE_LANGUAGE="Reference language"
+COM_LOCALISE_LABEL_REFERENCE_LANGUAGE_DESC="Please choose a Reference language."
+COM_LOCALISE_LABEL_INSTALLATION_FOLDER="Installation folder"
+COM_LOCALISE_LABEL_INSTALLATION_FOLDER_DESC="Please choose the Joomla installation folder."
+COM_LOCALISE_LABEL_SAVE_PERMISSION="File save permission"
+COM_LOCALISE_LABEL_SAVE_PERMISSION_DESC="Set what CHMOD permission the language file should get after being saved."
+COM_LOCALISE_LABEL_BING_CLIENTSECRET="Client Secret"
+COM_LOCALISE_LABEL_BING_CLIENTSECRET_DESC="Your application client secret on Windows Azure"
+COM_LOCALISE_LABEL_BING_CLIENTID_DESC="Your application client id on Windows Azure"
 COM_LOCALISE_LABEL_ADDITIONAL_COPYRIGHT="Your additional copyright"
 COM_LOCALISE_LABEL_ADDITIONAL_COPYRIGHT_DESC="Add any additional copyright information that you would like included"
-COM_LOCALISE_LABEL_ALLOWED_GROUPS="Groups allowed to edit in source mode"
-COM_LOCALISE_LABEL_ALLOWED_GROUPS_DESC="Optionally restrict users that can see and edit in source mode to those in the selected user groups. If none selected, all users can see and edit in source mode."
 COM_LOCALISE_LABEL_AUTHOR="Author"
 COM_LOCALISE_LABEL_AUTHOR_DESC="The name of the translator, typically your name"
 COM_LOCALISE_LABEL_BING_CLIENTID="Bing client ID"
-COM_LOCALISE_LABEL_BING_CLIENTID_DESC="Your application client id on Windows Azure"
-COM_LOCALISE_LABEL_BING_CLIENTSECRET="Client Secret"
-COM_LOCALISE_LABEL_BING_CLIENTSECRET_DESC="Your application client secret on Windows Azure"
 COM_LOCALISE_LABEL_COPYRIGHT="Copyright"
 COM_LOCALISE_LABEL_COPYRIGHT_DESC="Standard copyright information"
-COM_LOCALISE_LABEL_INSTALLATION_FOLDER="Installation folder"
-COM_LOCALISE_LABEL_INSTALLATION_FOLDER_DESC="Please choose the Joomla installation folder."
-COM_LOCALISE_LABEL_KEYS_TO_KEEP="Keys to keep in target"
-COM_LOCALISE_LABEL_KEYS_TO_KEEP_DESC="Keys that are not present in source but should be kept in target language. Enter the key constants, not the full string. <br />Example: INSTL_SAMPLE_LEARN_FR_SET_DESC"
 COM_LOCALISE_LABEL_LICENSE="License"
 COM_LOCALISE_LABEL_LICENSE_DESC="GNU/GPL"
-COM_LOCALISE_LABEL_REFERENCE_LANGUAGE="Reference language"
-COM_LOCALISE_LABEL_REFERENCE_LANGUAGE_DESC="Please choose a Reference language."
-COM_LOCALISE_LABEL_SAVE_PERMISSION="File save permission"
-COM_LOCALISE_LABEL_SAVE_PERMISSION_DESC="Set what CHMOD permission the language file should get after being saved."
-COM_LOCALISE_LABEL_SPECIAL_KEYS="Special strings"
-COM_LOCALISE_LABEL_SPECIAL_KEYS_DESC="<strong>Special keys/strings cases</strong><br />This helps handling &quot;Strings to not translate&quot;, &quot;Strings to protect&quot; or &quot;Keys to keep in target language&quot;.<br />Syntax: set your language tag and the lines separated list of full strings. For example: <br />[xx-XX]<br />KEY=&quot;Text&quot;<br />[/xx-XX].<br />For 'Keys to keep in target' case, use only the KEY. For example:<br />[xx-XX]<br />KEY<br />[/xx-XX]"
-COM_LOCALISE_LABEL_STRINGS_SAME="Strings not to translate"
-COM_LOCALISE_LABEL_STRINGS_SAME_DESC="Strings with the same value in both languages.<br />For example:<br />DECIMALS_SEPARATOR="_QQ_"."_QQ_"<br />THOUSANDS_SEPARATOR="_QQ_","_QQ_""
-COM_LOCALISE_LABEL_STRINGS_TO_PROTECT="Strings to protect"
-COM_LOCALISE_LABEL_STRINGS_TO_PROTECT_DESC="Strings that should be protected (not translated) in target language.<br />For example:<br />JHELP_COMPONENTS_SEARCH="_QQ_"Components_Search"_QQ_""
+COM_LOCALISE_LABEL_PRIORITY="Priority to extension folder"
+COM_LOCALISE_LABEL_PRIORITY_DESC="If the file exists, setting this to Yes will present as reference the files from the extension folder. Default is No, i.e. use the files from core folder." 
 COM_LOCALISE_LABEL_SUFFIXES="Suffixes of language's files"
 COM_LOCALISE_LABEL_SUFFIXES_DESC="Enter the suffixes of your language files. Separate suffixes with a comma. Example: if the name of your language files are 'en-GB.com_admin.sys.ini' and 'en-GB.com_admin.menu.ini', suffixes should be '.sys, .menu'"
 
@@ -205,12 +197,9 @@ COM_LOCALISE_LABEL_TRANSLATION_VERSION="Version"
 COM_LOCALISE_LABEL_TRANSLATION_VERSION_DESC=""
 COM_LOCALISE_TEXT_TRANSLATION_EDITOR="%1$s (%2$s)"
 COM_LOCALISE_TEXT_TRANSLATION_NOTINREFERENCE="Not in reference"
-COM_LOCALISE_TEXT_TRANSLATION_BLOCKED="Protected"
-COM_LOCALISE_TEXT_TRANSLATION_KEYTOKEEP="Key to keep"
 COM_LOCALISE_TEXT_TRANSLATION_TRANSLATED="Translated"
 COM_LOCALISE_TEXT_TRANSLATION_UNCHANGED="Unchanged"
 COM_LOCALISE_TEXT_TRANSLATION_UNTRANSLATED="Untranslated"
-COM_LOCALISE_TEXT_TRANSLATION_UNTRANSLATABLE="To not translate"
 COM_LOCALISE_TITLE_TRANSLATION="Translation"
 COM_LOCALISE_TOOLTIP_TRANSLATION_INSERT="<b>Insert</b><br/>Click to insert"
 COM_LOCALISE_TOOLTIP_TRANSLATION_GOOGLE="<b>Google</b><br/>Click to find a google translation"
@@ -291,11 +280,11 @@ COM_LOCALISE_TOOLTIP_TRANSLATIONS_ADDITIONAL_COPYRIGHT="Additional copyright::%s
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_CLIENT_ADMINISTRATOR="Administrator translation"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_CLIENT_INSTALLATION="Installation translation"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_CLIENT_SITE="Site translation"
-COM_LOCALISE_TOOLTIP_TRANSLATIONS_COMPLETE="Translation complete<br/>%1$s translated<br/>%2$s unchanged<br/>%3$s total<br/>%4$s extra<br/>%5$s to delete<br/>%6$s protected<br/>%7$s untranslatable"
+COM_LOCALISE_TOOLTIP_TRANSLATIONS_COMPLETE="Translation complete::%2$s unchanged<br/>%3$s total<br/>%4$s extra"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_EDIT="Edit translation"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_EDITRAW="Edit translation using a text editor"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_ERROR="Error::In file %1$s, lines %2$s"
-COM_LOCALISE_TOOLTIP_TRANSLATIONS_INPROGRESS="Translation in progress<br/>%1$s translated<br/>%2$s unchanged<br/>%3$s total<br/>%4$s extra<br/>%5$s to delete<br/>%6$s protected<br/>%7$s untranslatable"
+COM_LOCALISE_TOOLTIP_TRANSLATIONS_INPROGRESS="Translation in progress<br/>%1$s translated<br/>%2$s unchanged<br/>%3$s total<br/>%4$s extra"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_NEW="New translation"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_NEWRAW="New translation using a text editor"
 COM_LOCALISE_TOOLTIP_TRANSLATIONS_NOTEDITABLE="Not editable::Path %s is not editable"

component/admin/models/fields/key.php

@@ -57,7 +57,6 @@ protected function getInput()
 	{
 		// Set the class for the label.
 		$class = !empty($this->descText) ? 'key-label hasTooltip fltrt' : 'key-label fltrt';
-		$is_read_only = '';
 
 		// If a description is specified, use it to build a tooltip.
 		if (!empty($this->descText))
@@ -73,15 +72,7 @@ protected function getInput()
 		JText::script('COM_LOCALISE_LABEL_TRANSLATION_GOOGLE_ERROR');
 		$label .= $this->element['label'] . 'br />' . $this->element['description'];
 		$label .= '</label>';
-
-		if ($this->element['isblocked'] == '1')
-		{
-			$status = "blocked";
-		}
-		else
-		{
-			$status = (string) $this->element['status'];
-		}
+		$status = (string) $this->element['status'];
 
 		if ($status == 'extra')
 		{
@@ -93,44 +84,6 @@ protected function getInput()
 			$button2  = '<span style="width:5%;">'
 						. JHtml::_('image', 'com_localise/icon-16-bing-gray.png', '', array('class' => 'pointer'), true) . '</span>';
 		}
-		elseif ($status == 'blocked')
-		{
-			$is_read_only = ' readonly="readonly" ';
-			$onclick = "javascript:document.id(
-						'" . $this->id . "'
-						)
-						.set(
-						'value','" . addslashes(htmlspecialchars($this->element['description'], ENT_COMPAT, 'UTF-8')) . "'
-						);
-						document.id('" . $this->id . "').set('class','width-45 " . $status . "');";
-			$button  = '<i class="icon-reset hasTooltip return pointer" title="' . JText::_('COM_LOCALISE_TOOLTIP_TRANSLATION_INSERT')
-						. '" onclick="' . $onclick . '"></i>';
-			/* $onclick2 = "javascript:if (typeof(google) !== 'undefined') {
-			var translation='" . addslashes(htmlspecialchars($this->element['description'], ENT_COMPAT, 'UTF-8')) . "';
-				translation=translation.replace('%s','___s');translation=translation.replace('%d','___d');
-				translation=translation.replace(/%([0-9]+)\\\$s/,'___\$1');google.language.translate(translation,
-				Localise.language_src, Localise.language_dest, function(result) {if (result.translation) {
-			  translation = result.translation;
-			  translation = translation.replace('___s','%s');
-			  translation = translation.replace('___d','%d');
-			  translation = translation.replace(/___([0-9]+)/,'%$1\$s');
-			  document.id('" . $this->id . "').set('value',translation);
-			  if (document.id('" . $this->id . "').get('value')=='" . addslashes(htmlspecialchars($this->element['description'], ENT_COMPAT, 'UTF-8'))
-				. "') document.id('" . $this->id . "').set('class','width-45 blocked');
-				else document.id('" . $this->id . "').set('class','width-45 blocked');}
-				else alert(Joomla.JText._('COM_LOCALISE_LABEL_TRANSLATION_GOOGLE_ERROR'));});}
-				else alert(Joomla.JText._('COM_LOCALISE_LABEL_TRANSLATION_GOOGLE_ERROR'));";
-			  $button2 = '<span style="width:5%;">' . JHtml::_('image', 'com_localise/icon-16-google.png', '',
-				array('title' => JText::_('COM_LOCALISE_TOOLTIP_TRANSLATION_GOOGLE'), 'class' => 'hasTooltip pointer',
-				'onclick' => $onclick2), true) . '</span>';
-			  */
-			$token    = JSession::getFormToken();
-			$onclick2 = "javascript:AzureTranslator(this, [], 0, '$token');";
-			$button2  = '<input type="hidden" id="' . $this->id . 'text" value=\''
-						. addslashes(htmlspecialchars($this->element['description'], ENT_COMPAT, 'UTF-8')) . '\' />';
-			$button2 .= '<i class="icon-translate-bing hasTooltip translate pointer" title="'
-						. JText::_('COM_LOCALISE_TOOLTIP_TRANSLATION_AZURE') . '" onclick="' . $onclick2 . '" rel="' . $this->id . '"></i>';
-		}
 		else
 		{
 			$onclick = "javascript:document.id(
@@ -170,23 +123,13 @@ protected function getInput()
 						. JText::_('COM_LOCALISE_TOOLTIP_TRANSLATION_AZURE') . '" onclick="' . $onclick2 . '" rel="' . $this->id . '"></i>';
 		}
 
-		if ($status == 'blocked')
-		{
-			$final_status = 'blocked';
-		}
-		else
-		{
-			$final_status = ($this->value == '' ? 'untranslated' : ($this->value == $this->element['description'] ? $status : 'translated'));
-		}
-
 		$onkeyup = "javascript:";
 		$onkeyup .= "if (this.get('value')=='') {this.set('class','width-45 untranslated');}
 					else {if (this.get('value')=='" . addslashes(htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8'))
 					. "') this.set('class','width-45 " . $status . "');
-					" . (($status == 'extra' || $status == 'keytodelete') ? "else this.set('class','width-45 " . $status . "');}" :
-					"else this.set('class','width-45 translated');}");
-		$input = '<textarea name="' . $this->name . '" ' . $is_read_only . 'id="' . $this->id . '" onfocus="this.select()"
-					class="width-45 ' . $final_status . '" onkeyup="'
+					" . ($status == 'extra' ? "else this.set('class','width-45 extra');}" : "else this.set('class','width-45 translated');}");
+		$input = '<textarea name="' . $this->name . '" id="' . $this->id . '" onfocus="this.select()" class="width-45 ' . ($this->value == '' ?
+					'untranslated' : ($this->value == $this->element['description'] ? $status : 'translated')) . '" onkeyup="'
 					. $onkeyup . '">' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '</textarea>';
 
 		return $button . $button2 . $input;

component/admin/models/fields/keystatus.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Com_Localise
+ * @subpackage  models
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field State class.
+ *
+ * @package     Extensions.Components
+ * @subpackage  Localise
+ *
+ * @since       1.0
+ */
+class JFormFieldKeystatus extends JFormFieldList
+{
+	/**
+	 * The field type.
+	 *
+	 * @var    string
+	 */
+	protected $type = 'Keystatus';
+
+	/**
+	 * Method to get the field input.
+	 *
+	 * @return  string    The field input.
+	 */
+	protected function getOptions()
+	{
+		$attributes = '';
+
+		if ($v = (string) $this->element['onchange'])
+		{
+			$attributes .= ' onchange="' . $v . '"';
+		}
+
+		$attributes .= ' class="filter-select"';
+		$options = array();
+
+		foreach ($this->element->children() as $option)
+		{
+			$options[] = JHtml::_('select.option', '', JText::_(trim($option)),
+						array('option.attr' => 'attributes', 'attr' => 'class="filter-select"')
+						);
+		}
+
+		$options[] = JHtml::_('select.option', 'allkeys', JText::_('JALL'),
+						array('option.attr' => 'attributes', 'attr' => 'class="allkeys"')
+						);
+
+		$options[] = JHtml::_('select.option', 'translatedkeys', JText::_('COM_LOCALISE_TEXT_TRANSLATION_TRANSLATED'),
+						array('option.attr' => 'attributes', 'attr' => 'class="translated"')
+						);
+		$options[] = JHtml::_('select.option', 'untranslatedkeys', JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNTRANSLATED'),
+						array('option.attr' => 'attributes', 'attr' => 'class="untranslated"')
+						);
+		$options[] = JHtml::_('select.option', 'unchangedkeys', JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNCHANGED'),
+						array('option.attr' => 'attributes', 'attr' => 'class="unchanged"')
+						);
+
+		return $options;
+	}
+}

component/admin/models/fields/legend.php

@@ -34,19 +34,13 @@ class JFormFieldLegend extends JFormField
 	protected function getInput()
 	{
 		$return = '<table class="pull-left">';
-		$return .= '<tr><td><input class="translated center" size="40" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_TRANSLATED')
+		$return .= '<tr><td><input class="translated" size="30" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_TRANSLATED')
 					. '" readonly="readonly"/></td></tr>';
-		$return .= '<tr><td><input class="untranslatable center" size="40" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNTRANSLATABLE')
+		$return .= '<tr><td><input class="unchanged" size="30"  type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNCHANGED')
 					. '" readonly="readonly"/></td></tr>';
-		$return .= '<tr><td><input class="blocked center" size="40" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_BLOCKED')
+		$return .= '<tr><td><input class="untranslated" size="30"  type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNTRANSLATED')
 					. '" readonly="readonly"/></td></tr>';
-		$return .= '<tr><td><input class="unchanged center" size="40"  type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNCHANGED')
-					. '" readonly="readonly"/></td></tr>';
-		$return .= '<tr><td><input class="untranslated center" size="40"  type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_UNTRANSLATED')
-					. '" readonly="readonly"/></td></tr>';
-		$return .= '<tr><td><input class="extra center" size="40" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_KEYTOKEEP')
-					. '" readonly="readonly"/></td></tr>';
-		$return .= '<tr><td><input class="keytodelete center" size="40" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_NOTINREFERENCE')
+		$return .= '<tr><td><input class="extra" size="30" type="text" value="' . JText::_('COM_LOCALISE_TEXT_TRANSLATION_NOTINREFERENCE')
 					. '" readonly="readonly"/></td></tr>';
 		$return .= '</table>';
 

component/admin/models/forms/translation.xml

@@ -74,6 +74,20 @@
 			name="svn"
 			type="hidden" />
 	</fieldset>
+	<fields name="select">
+		<fieldset name="select">
+			<field
+				id="keystatus"
+				name="keystatus"
+				type="keystatus"
+				default=""
+				class="filter-select"
+				hidden="true"
+				onchange="this.form.submit()">
+				<option value="">JOPTION_SELECT_PUBLISHED</option>
+			</field>
+		</fieldset>
+	</fields>
 	<fieldset
 		label="COM_LOCALISE_FIELDSET_TRANSLATION_LEGEND"
 		description="COM_LOCALISE_FIELDSET_TRANSLATION_LEGEND_DESC"