Skip to content

Commit c22ea99

Browse files
authored
Merge pull request #490 from zonemaster/release/v2024.2.1
Merge release branch into master (GUI)
2 parents ca424f0 + c44ff94 commit c22ea99

File tree

9 files changed

+867
-8
lines changed

9 files changed

+867
-8
lines changed

Changes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
Release history for Zonemaster component Zonemaster-GUI
22

3+
4+
v4.4.0 2025-03-04 (part of Zonemaster v2024.2.1 release)
5+
6+
[Release information]
7+
- Translations have not been fully updated in this release. They will
8+
be updated in an upcoming release.
9+
10+
[Features]
11+
- Adds translation to Slovenian language. The translation is not
12+
complete (#482)
13+
14+
315
v4.3.1 2024-12-09 (part of Zonemaster v2024.2 release)
416

517
[Release information]

angular.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"nb": {
2727
"translation": "src/locale/messages.nb.xlf"
2828
},
29+
"sl": {
30+
"translation": "src/locale/messages.sl.xlf"
31+
},
2932
"sv": {
3033
"translation": "src/locale/messages.sv.xlf"
3134
}
@@ -111,6 +114,10 @@
111114
"localize": ["nb"],
112115
"baseHref": "/nb/"
113116
},
117+
"sl": {
118+
"localize": ["sl"],
119+
"baseHref": "/sl/"
120+
},
114121
"sv": {
115122
"localize": ["sv"],
116123
"baseHref": "/sv/"
@@ -151,6 +158,9 @@
151158
"nb": {
152159
"browserTarget": "zonemaster:build:nb"
153160
},
161+
"sl": {
162+
"browserTarget": "zonemaster:build:sl"
163+
},
154164
"sv": {
155165
"browserTarget": "zonemaster:build:sv"
156166
}
@@ -168,6 +178,7 @@
168178
"messages.fi.xlf",
169179
"messages.fr.xlf",
170180
"messages.nb.xlf",
181+
"messages.sl.xlf",
171182
"messages.sv.xlf"
172183
],
173184
"includeContext": "sourceFileOnly"

e2e/FR05.e2e-spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ test.describe('Zonemaster test FR05 - [Supports internationalization]', () => {
1414
{ language: 'Finnish', code: 'fi', expected: 'Verkkotunnus' },
1515
{ language: 'French', code: 'fr', expected: 'Nom de domaine' },
1616
{ language: 'Norwegian', code: 'nb', expected: 'Domenenavn' },
17+
{ language: 'Slovenian', code: 'sl', expected: 'Domena' },
1718
{ language: 'Swedish', code: 'sv', expected: 'Domännamn' },
1819
];
1920

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zonemaster-gui",
3-
"version": "4.3.1",
3+
"version": "4.4.0",
44
"license": "BSD-2-Clause",
55
"scripts": {
66
"ng": "ng",

src/assets/app.config.sample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiEndpoint": "/api",
33
"contactAddress": "[email protected]",
44
"defaultLanguage": "en",
5-
"enabledLanguages": [ "da", "en", "es", "fi", "fr", "nb", "sv" ],
5+
"enabledLanguages": [ "da", "en", "es", "fi", "fr", "nb", "sl", "sv" ],
66
"logoUrl": "assets/images/zonemaster_logo_2021_color.png",
77
"msgBanner": "",
88
"pollingInterval": 5000,

src/environments/common.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ export const common = {
1414
'fi': 'Suomi',
1515
'fr': 'Français',
1616
'nb': 'Norsk (bokmål)',
17+
'sl': 'Slovenščina',
1718
'sv': 'Svenska'
1819
},
19-
enabledLanguages: [ 'da', 'en', 'es', 'fi', 'fr', 'nb', 'sv' ],
20+
enabledLanguages: [ 'da', 'en', 'es', 'fi', 'fr', 'nb', 'sl', 'sv' ],
2021
configUrl: 'assets/app.config.json',
2122
pollingInterval: 5 * 1000,
2223
}

src/environments/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export const clientInfo = {
2-
version: '4.3.1',
2+
version: '4.4.0',
33
id: 'Zonemaster-GUI'
44
};

src/locale/messages.sl.xlf

Lines changed: 834 additions & 0 deletions
Large diffs are not rendered by default.

zonemaster.conf-example

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626

2727
RewriteCond %{REQUEST_FILENAME} !-f
2828
RewriteCond %{REQUEST_FILENAME} !-d
29-
RewriteRule "^(da|en|es|fi|fr|nb|sv)" $1/index.html [L]
29+
RewriteRule "^(da|en|es|fi|fr|nb|sl|sv)" $1/index.html [L]
3030

3131
# Rewrite path to new language scheme using preferred locale
32-
RewriteCond $1 "!^(da|en|es|fi|fr|nb|sv|assets)"
33-
RewriteCond %{HTTP:Accept-Language} ^(da|en|es|fi|fr|nb|sv) [NC]
32+
RewriteCond $1 "!^(da|en|es|fi|fr|nb|sl|sv|assets)"
33+
RewriteCond %{HTTP:Accept-Language} ^(da|en|es|fi|fr|nb|sl|sv) [NC]
3434
RewriteRule ^(.+)$ %1/index.html [L]
3535

3636
# Redirect user based on prefered locale
37-
RewriteCond %{HTTP:Accept-Language} ^(da|en|es|fi|fr|nb|sv) [NC]
37+
RewriteCond %{HTTP:Accept-Language} ^(da|en|es|fi|fr|nb|sl|sv) [NC]
3838
RewriteRule ^$ ${BASE_URL}%1/ [R,L]
3939

4040
# Default locale

0 commit comments

Comments
 (0)