Merge pull request #180 from nextcloud/backport/159/stable23

[stable23] Make sure strings are translated

5 files changed, 51 insertions, 43 deletions

diff --git a/composer.json b/composer.json
index 50d4d65..8e591e5 100644
--- a/composer.json
+++ b/composer.json
@@ -8,13 +8,11 @@
 	"name": "nextcloud/files_retention",
 	"description": "files_retention",
 	"license": "AGPL",
-	"require": {
-	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5",
 		"nextcloud/coding-standard": "^0.5.0",
-		"christophwurst/nextcloud": "dev-master@dev",
-		"vimeo/psalm": "^4.3.2"
+		"vimeo/psalm": "^4.3.2",
+		"christophwurst/nextcloud": "dev-stable23"
 	},
 	"config": {
 		"optimize-autoloader": true,
diff --git a/composer.lock b/composer.lock
index 4fa73ed..f15a527 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "67830675d35af38f636a0983570a8937",
+    "content-hash": "889f1f38bf44b016c5b10d63a01b5bc0",
     "packages": [],
     "packages-dev": [
         {
@@ -159,28 +159,28 @@
         },
         {
             "name": "christophwurst/nextcloud",
-            "version": "dev-master",
+            "version": "dev-stable23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "b8a6f713939cf124a3798de106c1798486d5d781"
+                "reference": "3725f37085a0de42135df9aad3939f7a137205c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/b8a6f713939cf124a3798de106c1798486d5d781",
-                "reference": "b8a6f713939cf124a3798de106c1798486d5d781",
+                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/3725f37085a0de42135df9aad3939f7a137205c2",
+                "reference": "3725f37085a0de42135df9aad3939f7a137205c2",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3 || ~8.0.0",
-                "psr/container": "^1.0",
+                "psr/container": "^1.1.1",
                 "psr/event-dispatcher": "^1.0",
                 "psr/log": "^1.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "22.0.0-dev"
+                    "dev-master": "23.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -194,7 +194,11 @@
                 }
             ],
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
-            "time": "2021-03-26T23:34:29+00:00"
+            "support": {
+                "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
+                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/stable23"
+            },
+            "time": "2022-06-02T14:13:38+00:00"
         },
         {
             "name": "composer/package-versions-deprecated",
@@ -1877,27 +1881,22 @@
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -1910,7 +1909,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -1922,7 +1921,11 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -1968,20 +1971,24 @@
                 "psr",
                 "psr-14"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -2005,7 +2012,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -2015,7 +2022,10 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2020-03-23T09:12:05+00:00"
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -4627,5 +4637,5 @@
     "platform-overrides": {
         "php": "7.3"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/js/retentionmodel.js b/js/retentionmodel.js
index f2d8e8c..35834e6 100644
--- a/js/retentionmodel.js
+++ b/js/retentionmodel.js
@@ -31,15 +31,15 @@
 		RETENTION_UNIT_YEAR: 3,
 
 		RETENTION_UNIT_MAP: {
-			0: 'days',
-			1: 'weeks',
-			2: 'months',
-			3: 'years'
+			0: t('files_retention', 'Days'),
+			1: t('files_retention', 'Weeks'),
+			2: t('files_retention', 'Months'),
+			3: t('files_retention', 'Years')
 		},
 
 		RETENTION_AFTER_MAP: {
-			0: 'creation',
-			1: 'last modification',
+			0: t('files_retention', 'Creation'),
+			1: t('files_retention', 'Last modification'),
 		},
 	});
 
diff --git a/js/retentionview.js b/js/retentionview.js
index 92f990f..aade6e0 100644
--- a/js/retentionview.js
+++ b/js/retentionview.js
@@ -60,7 +60,7 @@
 					id: model.attributes.id,
 					tagName: _this.tagCollection.get(model.attributes.tagid).attributes.name,
 					timeAmount: model.attributes.timeamount,
-					timeUnit: t('files_retention', OCA.File_Retention.RETENTION_UNIT_MAP[model.attributes.timeunit]),
+					timeUnit: OCA.File_Retention.RETENTION_UNIT_MAP[model.attributes.timeunit],
 					timeAfter: OCA.File_Retention.RETENTION_AFTER_MAP[model.attributes.timeafter],
 					hasJob: model.attributes.hasJob ? t('files_retention', 'Yes') : t('files_retention', 'No'),
 				};
diff --git a/templates/admin.php b/templates/admin.php
index caecfc9..9976a32 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -33,11 +33,11 @@
 
 	<table>
 		<thead class="hidden" id="retention-list-header">
-			<th>Tag</th>
-			<th>Retention</th>
-			<th>Time</th>
-			<th>After</th>
-			<th>Active</th>
+			<th><?php p($l->t('Tag')); ?></th>
+			<th><?php p($l->t('Retention')); ?></th>
+			<th><?php p($l->t('Time')); ?></th>
+			<th><?php p($l->t('After')); ?></th>
+			<th><?php p($l->t('Active')); ?></th>
 			<th></th>
 		</thead>
 		<tbody id="retention-list">