Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable24] Fix translatable strings issues #1078

Merged
merged 3 commits into from
Mar 10, 2025
Merged

[stable24] Fix translatable strings issues #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2280ff3
fix translatable strings issues
julien-nc Mar 10, 2025
0d20da4
fix backport
julien-nc Mar 10, 2025
4f8a089
fix tests
julien-nc Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 9 additions & 26 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
30 changes: 1 addition & 29 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions src/components/AdminSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/SettingsForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
Loading