From c24973992a44dc480dd0ce7743ac45dedf392254 Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@gmail.com>
Date: Fri, 12 Jan 2024 19:43:37 +0100
Subject: [PATCH] version 12, 1.2.2: added 5th option for canteen day
 formatting

---
 app/build.gradle.kts                                          | 4 ++--
 app/release/output-metadata.json                              | 4 ++--
 .../com/denizk0461/weserplaner/fragment/CanteenFragment.kt    | 3 ++-
 app/src/main/res/values/strings.xml                           | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b107b4b..69c7853 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "com.denizk0461.weserplaner"
         minSdk = 24
         targetSdk = 34
-        versionCode = 11
-        versionName = "1.2.1"
+        versionCode = 12
+        versionName = "1.2.2"
 
         resourceConfigurations += arrayOf("en", "de")
 
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a2a1510..24ab806 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 11,
-      "versionName": "1.2.1",
+      "versionCode": 12,
+      "versionName": "1.2.2",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt b/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt
index 28fb8e8..4045d08 100644
--- a/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt
+++ b/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt
@@ -234,7 +234,8 @@ class CanteenFragment : AppFragment<FragmentCanteenBinding>() {
                 0 -> "${d.day.shortenDay()}, ${d.date}"
                 1 -> "${d.day}, ${d.date}"
                 2 -> d.date
-                else -> d.day // 3
+                3 -> d.day
+                else -> d.day.shortenDay()
             }}
         }.attach()
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 017f17d..b7acd3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -299,6 +299,7 @@
         <item translatable="false">Freitag, 12.01.</item>
         <item translatable="false">12.01.</item>
         <item translatable="false">Freitag</item>
+        <item translatable="false">Fr.</item>
     </string-array>
 
     <string name="settings_allergens_title">Mark offers with allergens with a star*</string>