Merge branch 'staging' into save

joomla · Jan 21, 2020 · 9c24d73 · 9c24d73
2 parents 09e3f59 + 78f0d52
commit 9c24d73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
@@ -112,6 +112,7 @@ public static function getFields($context, $item = null, $prepareValue = false,
 		}
 
 		self::$fieldsCache->setState('filter.context', $context);
+		self::$fieldsCache->setState('filter.assigned_cat_ids', array());
 
 		/*
 		 * If item has assigned_cat_ids parameter display only fields which

diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -280,7 +280,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Neboli nájdené žiadne výsledky"
 JGLOBAL_SELECT_SOME_OPTIONS="Neboli nájdené žiadne výsledky"
 JINVALID_TOKEN="Najnovšia žiadosť bola zamietnutá, pretože obsahovala nesprávny bezpečnostný reťazec. Obnovte stránku a skúste znova, prosím."
 JNEXT="Nasl."
-JNO="Poznámky"
+JNO="Nie"
 JNOTICE="Poznámky"
 JOFF="Vyp."
 JON="Zap."

diff --git a/installation/language/sk-SK/sk-SK.xml b/installation/language/sk-SK/sk-SK.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.9" client="installation">
 	<name>Slovenčina (Slovak)</name>
-	<version>3.9.12</version>
-	<creationDate>September 2019</creationDate>
+	<version>3.9.15</version>
+	<creationDate>January 2020</creationDate>
 	<author>Slovak translation team : Peter Michnica</author>
-	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. Všetky práva vyhradené.</copyright>
+	<copyright>Copyright (C) 2005 - 2020 Open Source Matters. Všetky práva vyhradené.</copyright>
 	<license>GNU General Public License verzie 2 alebo neskoršej; Pozrite si súbor LICENSE.txt</license>
 	<files>
 		<filename>sk-SK.ini</filename>