Merge pull request #1078 from nextcloud/backport/1075/stable24

[stable24] Fix translatable strings issues
nextcloud · Mar 10, 2025 · 07883d9 · 07883d9
2 parents 67e72ea + 4f8a089
commit 07883d9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 58 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -20,32 +20,11 @@ jobs:
       matrix:
         php-versions: ['8.0']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['stable24']
         include:
             - php-versions: 8.1
               databases: mysql
               server-versions: stable24
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable25
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable26
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable27
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable28
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: master
-            - php-versions: 8.2
-              databases: mysql
-              server-versions: master
-            - php-versions: 8.3
-              databases: mysql
-              server-versions: master
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -87,15 +66,17 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Start keycloak
-        run: docker-compose -f "docker-compose.integration.yml" up -d --build
+        run: |
+          docker-compose -f "docker-compose.integration.yml" up -d --build \
+            || docker compose -f "docker-compose.integration.yml" up -d --build
         working-directory: apps/${{ env.APP_NAME }}/tests/
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.12.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql,
+          extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql,
           coverage: none
 
       - name: Set up PHPUnit
@@ -130,5 +111,7 @@ jobs:
 
       - name: Stop containers
         if: always()
-        run: docker-compose -f "docker-compose.integration.yml" down
+        run: |
+          docker-compose -f "docker-compose.integration.yml" down \
+            || docker compose -f "docker-compose.integration.yml" down
         working-directory: apps/${{ env.APP_NAME }}/tests/
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -21,35 +21,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
         databases: ['mysql']
-        server-versions: ['stable24', 'stable25', 'stable26', 'stable27', 'stable28', 'master']
-        exclude:
-          - php-versions: 7.4
-            server-versions: master
-          - php-versions: 7.4
-            server-versions: stable28
-          - php-versions: 7.4
-            server-versions: stable27
-          - php-versions: 7.4
-            server-versions: stable26
-        include:
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable26
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable27
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable28
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: stable28
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: master
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: master
+        server-versions: ['stable24']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
@@ -195,7 +195,7 @@ export default {
 				})
 			} catch (error) {
 				logger.error('Could not save ID4me state: ' + error.message, { error })
-				showError(t('user_oidc', 'Could not save ID4me state: ' + error.message))
+				showError(t('user_oidc', 'Could not save ID4me state: {msg}', { msg: error.message }))
 			} finally {
 				this.loadingId4Me = false
 			}
@@ -230,7 +230,7 @@ export default {
 				this.providers = this.providers.filter(p => p.id !== provider.id)
 			} catch (error) {
 				logger.error('Could not remove a provider: ' + error.message, { error })
-				showError(t('user_oidc', 'Could not remove provider: ' + error.message))
+				showError(t('user_oidc', 'Could not remove provider: {msg}', { msg: error.message }))
 			}
 		},
 		async onSubmit() {

diff --git a/src/components/SettingsForm.vue b/src/components/SettingsForm.vue
@@ -124,7 +124,7 @@
 			{{ t('user_oidc', 'Use group provisioning.') }}
 		</NcCheckboxRadioSwitch>
 		<p class="settings-hint">
-			{{ t('user_oidc', 'This will create and update the users groups depending on the groups claim in the id token. The Format of the groups claim value should be [{gid: "1", displayName: "group1"}, ...] or ["group1", "group2", ...]') }}
+			{{ t('user_oidc', 'This will create and update the users groups depending on the groups claim in the id token. The Format of the groups claim value should be {sample1} or {sample2}', { sample1: '[{gid: "1", displayName: "group1"}, …]', sample2: '["group1", "group2", …]' }, undefined, { escape: false }) }}
 		</p>
 		<NcCheckboxRadioSwitch :checked.sync="localProvider.settings.checkBearer" wrapper-element="div">
 			{{ t('user_oidc', 'Check Bearer token on API and WebDav requests') }}