Merge remote-tracking branch 'upstream/4.1-dev' into translation

joomla · Mar 22, 2022 · 4afcc76 · 4afcc76
2 parents 804d127 + 2aed571
commit 4afcc76
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/administrator/components/com_scheduler/src/Controller/TasksController.php b/administrator/components/com_scheduler/src/Controller/TasksController.php
@@ -47,9 +47,9 @@ public function getModel($name = 'Task', $prefix = 'Administrator', $config = ['
 	 * Unlock a locked task, i.e., a task that is presumably still running but might have crashed and got stuck in the
 	 * "locked" state.
 	 *
-	 * @return void
+	 * @return  void
 	 *
-	 * @since __DEPLOY__VERSION__
+	 * @since   4.1.0
 	 */
 	public function unlock(): void
 	{

diff --git a/administrator/components/com_scheduler/src/Table/TaskTable.php b/administrator/components/com_scheduler/src/Table/TaskTable.php
@@ -33,7 +33,7 @@ class TaskTable extends Table
 	 * Indicates that columns fully support the NULL value in the database
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY__VERSION__
+	 * @since  4.1.1
 	 */
 	protected $_supportNullValue = true;
 
@@ -202,7 +202,7 @@ public function bind($src, $ignore = array()): bool
 	 *
 	 * @return  boolean  True on success; false if $pks is empty.
 	 *
-	 * @since   __DEPLOY__VERSION__
+	 * @since   4.1.0
 	 * @throws  QueryTypeAlreadyDefinedException|\UnexpectedValueException|\BadMethodCallException
 	 */
 	public function unlock(array $pks = [], ?int $userId = null): bool

diff --git a/administrator/components/com_scheduler/src/Task/Task.php b/administrator/components/com_scheduler/src/Task/Task.php
@@ -68,7 +68,7 @@ class Task implements LoggerAwareInterface
 	/**
 	 * Map state enumerations to logical language adjectives.
 	 *
-	 * @since __DEPLOY__VERSION__
+	 * @since 4.1.0
 	 */
 	public const STATE_MAP = [
 		self::STATE_TRASHED  => 'trashed',

diff --git a/administrator/components/com_scheduler/src/View/Task/HtmlView.php b/administrator/components/com_scheduler/src/View/Task/HtmlView.php
@@ -63,7 +63,7 @@ class HtmlView extends BaseHtmlView
 	 * The actions the user is authorised to perform
 	 *
 	 * @var  CMSObject
-	 * @since  __DEPLOY__VERSION__
+	 * @since  4.1.0
 	 */
 	protected $canDo;
 

diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
@@ -41,8 +41,8 @@ JH6="h6"
 
 ERROR="Error"
 INFO="Info"
-NOTICE="Notice"
 MESSAGE="Message"
+NOTICE="Notice"
 WARNING="Warning"
 
 JACTIONS="Actions for: %s"

diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
@@ -41,8 +41,8 @@ JH6="h6"
 
 ERROR="Error"
 INFO="Info"
-NOTICE="Notice"
 MESSAGE="Message"
+NOTICE="Notice"
 WARNING="Warning"
 
 JACTIONS="Actions for: %s"

diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
@@ -11,8 +11,8 @@ JERROR_PARSING_LANGUAGE_FILE="&#160;: error(s) in line(s) %s"
 
 ERROR="Error"
 INFO="Info"
-MESSAGE="Message"
 NOTICE="Notice"
+MESSAGE="Message"
 WARNING="Warning"
 
 J1="1"
@@ -421,7 +421,6 @@ DATE_FORMAT_FILTER_DATE="Y-m-d"
 DATE_FORMAT_FILTER_DATETIME="Y-m-d H:i:s"
 
 ; Months
-
 JANUARY_SHORT="Jan"
 JANUARY="January"
 FEBRUARY_SHORT="Feb"
@@ -464,7 +463,6 @@ FRI="Fri"
 FRIDAY="Friday"
 
 ; Localised number format
-
 DECIMALS_SEPARATOR="."
 THOUSANDS_SEPARATOR=","
 

diff --git a/plugins/task/demotasks/demotasks.php b/plugins/task/demotasks/demotasks.php
@@ -21,7 +21,7 @@
  * A demo task plugin. Offers 3 task routines and demonstrates the use of {@see TaskPluginTrait},
  * {@see ExecuteTaskEvent}.
  *
- * @since __DEPLOY__VERSION__
+ * @since 4.1.0
  */
 class PlgTaskDemotasks extends CMSPlugin implements SubscriberInterface
 {