Merge pull request #215 from karlomikus/develop

Image update, language update
karlomikus · Aug 25, 2024 · b7c21c4 · b7c21c4
2 parents c00b781 + dc07bb2
commit b7c21c4
Show file tree

Hide file tree

Showing 23 changed files with 308 additions and 253 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.18.0
+## New
+- Enabled Italian language
+
+## Changes
+- Updated base docker image to alpine 3.20
+
 # v2.17.2
 ## Fixes
 - Fix substitute ingredient showing null amounts as `1`

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:current-alpine3.15 as build
+FROM node:current-alpine3.20 AS build
 
 ARG BUILD_VERSION
 ENV BUILD_VERSION=${BUILD_VERSION:-develop}
@@ -12,7 +12,7 @@ RUN sed -i "s/{{VERSION}}/$BUILD_VERSION/g" ./docker/config.js
 
 RUN npm run build
 
-FROM nginx as prod
+FROM nginx AS prod
 
 COPY --from=build /app/dist /var/www/html
 

diff --git a/src/locales/it-IT.js b/src/locales/it-IT.js
@@ -0,0 +1,25 @@
+import messages from './messages/it-IT.json'
+
+const datetime = {
+    'short': {
+        'year': 'numeric',
+        'month': 'short',
+        'day': 'numeric'
+    },
+    'long': {
+        'year': 'numeric',
+        'month': 'short',
+        'day': 'numeric',
+        'weekday': 'short',
+        'hour': 'numeric',
+        'minute': 'numeric'
+    }
+}
+
+const numbers = {
+    decimal: {
+        style: 'decimal', minimumFractionDigits: 2, maximumFractionDigits: 2
+    }
+}
+
+export default { messages, datetime, numbers }
diff --git a/src/locales/messages/cs-CZ.json b/src/locales/messages/cs-CZ.json
@@ -5,6 +5,7 @@
     "hr-HR": "Croatian",
     "de-DE": "German",
     "pl-PL": "Polish",
+    "it-IT": "Italian",
     "help": "Help with translations"
   },
   "shelf": {

diff --git a/src/locales/messages/da-DK.json b/src/locales/messages/da-DK.json
@@ -5,6 +5,7 @@
     "hr-HR": "Croatian",
     "de-DE": "German",
     "pl-PL": "Polish",
+    "it-IT": "Italian",
     "help": "Help with translations"
   },
   "shelf": {

diff --git a/src/locales/messages/de-DE.json b/src/locales/messages/de-DE.json
@@ -5,6 +5,7 @@
     "hr-HR": "Kroatisch",
     "de-DE": "Deutsch",
     "pl-PL": "Polnische",
+    "it-IT": "Italian",
     "help": "Hilfe bei Übersetzungen"
   },
   "shelf": {
@@ -18,7 +19,7 @@
     "cocktails": "Cocktails, die ich mixen kann"
   },
   "ingredient": {
-    "title": "Besandteil",
+    "title": "Bestandteil",
     "categories": "Zutaten Kategorien",
     "main": "Hauptzutaten",
     "add": "Zutat hinzufügen",
@@ -325,8 +326,8 @@
   },
   "subtitle": "Untertitel",
   "delete-my-account": "Mein Konto und alle meine Daten löschen",
-  "data": "Data",
-  "profile-information": "Profile information",
+  "data": "Daten",
+  "profile-information": "Profilinformationen",
   "remove-cocktail-from-collection": "Cocktail aus der Sammlung entfernen",
   "cocktail-collections": "Cocktailsammlungen",
   "cocktails-not-found": "Keine Cocktails gefunden",
@@ -562,8 +563,8 @@
     "unfavorited": "\"{name}\" aus den Favoriten entfernt",
     "update-success": "Cocktail aktuallisiert",
     "add": "Neuer Cocktail",
-    "copy-action": "Duplicate and edit",
-    "copy-success": "Cocktail duplicated",
+    "copy-action": "Kopieren und bearbeiten",
+    "copy-success": "Cocktail kopiert",
     "source": "Cocktail Herkunft"
   },
   "ABV-definition": "Volumenprozent Alkohol",

diff --git a/src/locales/messages/el-GR.json b/src/locales/messages/el-GR.json
@@ -5,6 +5,7 @@
     "hr-HR": "Croatian",
     "de-DE": "German",
     "pl-PL": "Polish",
+    "it-IT": "Italian",
     "help": "Help with translations"
   },
   "shelf": {

diff --git a/src/locales/messages/en-US.json b/src/locales/messages/en-US.json
@@ -5,6 +5,7 @@
     "hr-HR": "Croatian",
     "de-DE": "German",
     "pl-PL": "Polish",
+    "it-IT": "Italian",
     "help": "Help with translations"
   },
   "shelf": {

diff --git a/src/locales/messages/es-ES.json b/src/locales/messages/es-ES.json
@@ -5,6 +5,7 @@
     "hr-HR": "Croatian",
     "de-DE": "German",
     "pl-PL": "Polish",
+    "it-IT": "Italian",
     "help": "Help with translations"
   },
   "shelf": {

diff --git a/src/locales/messages/fi-FI.json b/src/locales/messages/fi-FI.json
@@ -5,6 +5,7 @@
     "hr-HR": "Croatian",
     "de-DE": "German",
     "pl-PL": "Polish",
+    "it-IT": "Italian",
     "help": "Help with translations"
   },
   "shelf": {