Bug #21 fix: Terms & Conditions Filter - Language constant displayed …

…in filter placeholder. (#22) * Bug #157795 fix: Terms & Conditions Filter - Language constant COM_TC_CONTENTS_TC_CODE_FILTER displayed in filter placeholder. * Bug #157795 fix: Terms & Conditions Filter - Language constant displayed in filter placeholder. * Bug #157795 fix: Terms & Conditions Filter - Language constant displayed in filter placeholder. * Bug #157795 fix: Terms & Conditions Filter - Language constant COM_TC_CONTENTS_TC_CODE_FILTER displayed in filter placeholder.
techjoomla · Feb 20, 2020 · fc6b1eb · fc6b1eb
1 parent cbc1960
commit fc6b1eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/components/com_tc/administrator/models/forms/filter_contents.xml b/src/components/com_tc/administrator/models/forms/filter_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
   <fields name="filter">
-    <field name="search" type="text" filter="string" label="JSEARCH_FILTER" description="JSEARCH_FILTER_DESC" hint="JSEARCH_FILTER" />
+    <field name="search" type="text" filter="string" label="JSEARCH_FILTER" description="COM_TC_CONTENTS_SEARCH_FILTER_DESC" hint="JSEARCH_FILTER" />
     <field name="state" type="status" label="COM_TC_CONTENTS_FILTER_PUBLISHED" description="COM_TC_CONTENTS_FILTER_PUBLISHED_DESC" onchange="this.form.submit();">
       <option value="">JOPTION_SELECT_PUBLISHED</option>
     </field>
@@ -22,7 +22,7 @@
       <option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
       <option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
       <option value="a.version ASC">COM_TC_CONTENTS_VERSION_ASC</option>
-      <option value="a.version DESC">COM_TC_CONTENTS_VERSION_ASC</option>
+      <option value="a.version DESC">COM_TC_CONTENTS_VERSION_DES</option>
       <option value="a.client ASC">COM_TC_CONTENTS_TC_CODE_ASC</option>
       <option value="a.client DESC">COM_TC_CONTENTS_TC_CODE_DES</option>
       <option value="a.start_date DESC">COM_TC_CONTENTS_STARTDATE_ASC</option>

diff --git a/src/components/com_tc/administrator/models/forms/filter_usertcs.xml b/src/components/com_tc/administrator/models/forms/filter_usertcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
   <fields name="filter">
-    <field name="search" type="text" filter="string" label="JSEARCH_FILTER" description="JSEARCH_FILTER_DESC" hint="JSEARCH_FILTER" />
+    <field name="search" type="text" filter="string" label="JSEARCH_FILTER" description="COM_TC_USERS_SEARCH_FILTER_DESC" hint="JSEARCH_FILTER" />
     <field name="client" type="sql" query="SELECT DISTINCT (`client`) FROM `#__tc_content` ORDER BY client ASC" key_field="client" value_field="client" filter="safehtml" label="COM_TC_CONTENTS_TC_CODE" description="COM_TC_CONTENTS_TC_CODE_FILTER_DESC" onchange="this.form.submit();">
       <option value="">COM_TC_CONTENTS_TC_CODE_FILTER</option>
     </field>

diff --git a/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini b/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini
@@ -39,7 +39,7 @@ COM_TC_CONTENTS_CREATED_BY="Created by"
 COM_TC_CONTENTS_MODIFIED_BY="Modified by"
 COM_TC_CONTENTS_TITLE="Title"
 COM_TC_CONTENTS_VERSION="Version"
-COM_TC_CONTENTS_CLIENT="T&C code"
+COM_TC_CONTENTS_TC_CODE="T&C code"
 COM_TC_CONTENTS_START_DATE="Start Date"
 COM_TC_CONTENTS_CONTENT="Content"
 COM_TC_TITLE_CONTENT="Terms and conditions"
@@ -63,7 +63,7 @@ COM_TC_FORM_DESC_CONTENT_TITLE=""
 COM_TC_FORM_LBL_CONTENT_VERSION="Version"
 COM_TC_FORM_DESC_CONTENT_VERSION=""
 COM_TC_FORM_LBL_CONTENT_TC_CODE="T&C code"
-COM_TC_FORM_DESC_CONTENT_CLIENT="Apply to specific extensions "
+COM_TC_FORM_DESC_CONTENT_TC_CODE="Apply to specific extensions "
 COM_TC_FORM_LBL_CONTENT_START_DATE="Start Date"
 COM_TC_FORM_DESC_CONTENT_START_DATE=""
 COM_TC_FORM_LBL_CONTENT_CONTENT="Content"
@@ -91,7 +91,7 @@ COM_TC_FORM_LBL_CONTENT_SELECT_USER_GROUP="Select User Groups"
 COM_TC_FORM_LBL_CONTENT_SELECT_USER_GROUP_DESC="Select user groups for T&C"
 COM_TC_FORM_LBL_CONTENT_URL_PATTERN="URL Pattern"
 COM_TC_FORM_LBL_CONTENT_URL_PATTERN_DESC="URL Pattern is used to store option & view of your URL Ex. Option = 'com_ekcontent' & view = 'content'"
-COM_TC_VALIDATION_FORM_INVALID_TC="This Version & Client are already stored, please enter another Version & Client"
+COM_TC_VALIDATION_FORM_INVALID_TC="This Version & T&C code are already stored, please enter another Version & T&C code"
 COM_TC_TITLE_PERMISSIONS="Access Control"
 COM_TC_VALIDATION_FORM_LATEST_VERSION_TC ="Latest version of this T&C "
 COM_TC_VALIDATION_FORM_GREATER_VERSION_TC =" please enter greater version"
@@ -101,12 +101,12 @@ COM_TC_CONTENTS_LATEST="Latest"
 COM_TC_CONTENTS_ALL="All"
 COM_TC_CONTENTS_FILTER_PUBLISHED="Status"
 COM_TC_CONTENTS_FILTER_PUBLISHED_DESC="Status"
-COM_TC_CONTENTS_CLIENT_FILTER="- Select T&C code -"
-COM_TC_CONTENTS_CLIENT_FILTER_DESC="T&C code"
+COM_TC_CONTENTS_TC_CODE_FILTER="- Select T&C code -"
+COM_TC_CONTENTS_TC_CODE_FILTER_DESC="T&C code"
 COM_TC_CONTENTS_VERSION_ASC="Version ascending"
 COM_TC_CONTENTS_VERSION_DES="Version descending"
-COM_TC_CONTENTS_CLIENT_ASC="T&C code ascending"
-COM_TC_CONTENTS_CLIENT_DES="T&C code descending"
+COM_TC_CONTENTS_TC_CODE_ASC="T&C code ascending"
+COM_TC_CONTENTS_TC_CODE_DES="T&C code descending"
 COM_TC_CONTENTS_STARTDATE_ASC="Startdate ascending"
 COM_TC_CONTENTS_STARTDATE_DES="Startdate descending"
 COM_TC_BASIC_CONFIG_SET="Basic configuration"
@@ -115,3 +115,5 @@ COM_TC_DATE_FORMAT_TO_SHOW_DESC="You can set the format to display the date on t
 COM_TC_CUSTOM_DATE_FORMAT="Custom date format"
 COM_TC_CUSTOM_DATE_FORMAT_DESC="You can customize the date format here"
 COM_TC_DATE_FORMAT_CUSTOM="custom"
+COM_TC_CONTENTS_SEARCH_FILTER_DESC="Search by Title or Version"
+COM_TC_USERS_SEARCH_FILTER_DESC="Search by User name, Terms and Conditions or T&C code"