Merge branch 'master' into master

tkem · Dec 19, 2024 · 74dd7d1 · 74dd7d1
2 parents 899304e + f9ed693
commit 74dd7d1
Show file tree

Hide file tree

Showing 8 changed files with 2,013 additions and 1,238 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [tkem]
+custom: ["https://www.paypal.me/tkem"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - run: npm install -g cordova @ionic/cli
       - run: npm install
       - run: ionic cordova build android --prod
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: android
           path: platforms/android/**/*.apk
@@ -31,7 +31,7 @@ jobs:
       - run: npm install -g cordova @ionic/cli
       - run: npm install
       - run: ionic cordova build ios --prod
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ios
           path: platforms/ios/build/**/*.app
@@ -45,7 +45,7 @@ jobs:
       - run: npm install -g @ionic/cli
       - run: npm install
       - run: ionic build --prod -- --base-href=/openlap/ --service-worker
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pwa
           path: www
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
-2.3.1 UNRELEASED
+2.4.0 2024-12-02
+----------------
+
+- Add Português translation (courtesy of Ilduario).
+
+- Update dependencies.
+
+
+2.3.1 2024-08-19
 ----------------
 
 - Upgrade to `cordova-android` 13.0.0.

diff --git a/README.md b/README.md
@@ -108,9 +108,10 @@ License
 Copyright (c) 2016-2024 Thomas Kemmer.
 
 Translations: Haarman (Nederlands), SdiF (Italiano), Maikeru
-(Español), nico12 (Français), Ludevik (Slovak).
+(Español), nico12 (Français), Ludevik (Slovak), Ilduario (Português).
 
-iOS support: softyde, elliot2extreme.
+iOS support: [softyde](https://github.com/softyde),
+[elliot2extreme](https://github.com/elliot2extreme).
 
 Licensed under the [Apache License, Version
 2.0](http://www.apache.org/licenses/LICENSE-2.0).

diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="20302" id="at.co.kemmer.openlap" version="2.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="20400" id="at.co.kemmer.openlap" version="2.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>OpenLap</name>
     <description>Open Source Slotcar Race App for Carrera(R) Digital 124/132</description>
     <author email="[email protected]">Thomas Kemmer</author>

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/settings/about.page.html b/src/app/settings/about.page.html
@@ -34,7 +34,7 @@ <h1>Open Lap {{version | async}}</h1>
   <ion-item>
     <ion-label class="ion-text-wrap">
       <span translate>Translations</span>:
-      Haarman (Nederlands), SdiF (Italiano), Maikeru (Español), nico12 (Français), Ludevik (Slovak).
+      SdiF (Italiano), Maikeru (Español), nico12 (Français), Ludevik (Slovak), Ilduario (Português).
     </ion-label>
   </ion-item>
   <ion-item>

diff --git a/src/app/settings/settings.page.html b/src/app/settings/settings.page.html
@@ -22,6 +22,7 @@
         <ion-select-option value="es">Español</ion-select-option>
         <ion-select-option value="fr">Français</ion-select-option>
         <ion-select-option value="it">Italiano</ion-select-option>
+        <ion-select-option value="pt">Português</ion-select-option>
         <ion-select-option value="sk">Slovak</ion-select-option>
       </ion-select>
     </ion-item>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github: [tkem]
		custom: ["https://www.paypal.me/tkem"]