From a043eaec814897ad949e397b8be5cfb9659dc65f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 1 May 2023 15:21:04 +0200
Subject: [PATCH] Change for #1105

---
 plugins/nextcloud/langs/de-DE.json            | 14 ++++++++++++++
 plugins/nextcloud/langs/en.ini                | 11 -----------
 plugins/nextcloud/langs/en.json               | 14 ++++++++++++++
 plugins/nextcloud/langs/ru.json               | 14 ++++++++++++++
 plugins/nextcloud/langs/zh-CN.ini             | 11 -----------
 plugins/nextcloud/langs/zh-CN.json            | 14 ++++++++++++++
 .../libraries/RainLoop/Plugins/Manager.php    | 19 +++++++++++--------
 7 files changed, 67 insertions(+), 30 deletions(-)
 create mode 100644 plugins/nextcloud/langs/de-DE.json
 delete mode 100644 plugins/nextcloud/langs/en.ini
 create mode 100644 plugins/nextcloud/langs/en.json
 create mode 100644 plugins/nextcloud/langs/ru.json
 delete mode 100644 plugins/nextcloud/langs/zh-CN.ini
 create mode 100644 plugins/nextcloud/langs/zh-CN.json

diff --git a/plugins/nextcloud/langs/de-DE.json b/plugins/nextcloud/langs/de-DE.json
new file mode 100644
index 000000000..5f43f1357
--- /dev/null
+++ b/plugins/nextcloud/langs/de-DE.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Speichern Sie in Nextcloud",
+		"SAVE_EML": "Als .eml in Nextcloud speichern",
+		"SAVE_ICS": "Kalender eintragen",
+		"SELECT_FOLDER": "Ordner auswählen",
+		"SELECT_FILES": "Datei(en) auswählen",
+		"ATTACH_FILES": "Nextcloud-Dateien anhängen",
+		"SELECT_CALENDAR": "Kalender auswählen",
+		"FILE_ATTACH": "anfügen",
+		"FILE_INTERNAL": "intern",
+		"FILE_PUBLIC": "öffentlich"
+	}
+}
diff --git a/plugins/nextcloud/langs/en.ini b/plugins/nextcloud/langs/en.ini
deleted file mode 100644
index b920f77d9..000000000
--- a/plugins/nextcloud/langs/en.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[NEXTCLOUD]
-SAVE_ATTACHMENTS = "Save in Nextcloud"
-SAVE_EML = "Save as .eml in Nextcloud"
-SAVE_ICS = "Put in Calendar"
-SELECT_FOLDER = "Select folder"
-SELECT_FILES = "Select file(s)"
-ATTACH_FILES = "Attach Nextcloud files"
-SELECT_CALENDAR = "Select calendar"
-FILE_ATTACH = "attach"
-FILE_INTERNAL = "internal"
-FILE_PUBLIC = "public"
diff --git a/plugins/nextcloud/langs/en.json b/plugins/nextcloud/langs/en.json
new file mode 100644
index 000000000..1f2660547
--- /dev/null
+++ b/plugins/nextcloud/langs/en.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Save in Nextcloud",
+		"SAVE_EML": "Save as .eml in Nextcloud",
+		"SAVE_ICS": "Put in Calendar",
+		"SELECT_FOLDER": "Select folder",
+		"SELECT_FILES": "Select file(s)",
+		"ATTACH_FILES": "Attach Nextcloud files",
+		"SELECT_CALENDAR": "Select calendar",
+		"FILE_ATTACH": "attach",
+		"FILE_INTERNAL": "internal",
+		"FILE_PUBLIC": "public"
+	}
+}
diff --git a/plugins/nextcloud/langs/ru.json b/plugins/nextcloud/langs/ru.json
new file mode 100644
index 000000000..a8b28372d
--- /dev/null
+++ b/plugins/nextcloud/langs/ru.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Сохранить в Nextcloud",
+		"SAVE_EML": "Сохранить как .eml в Nextcloud",
+		"SAVE_ICS": "Вставить в календарь",
+		"SELECT_FOLDER": "Выбрите папку",
+		"SELECT_FILES": "Выберите файл(ы)",
+		"ATTACH_FILES": "Прикрепить файлы из Nextcloud",
+		"SELECT_CALENDAR": "Выбрать календарь",
+		"FILE_ATTACH": "Прикрепить с ПК",
+		"FILE_INTERNAL": "Внутреняя",
+		"FILE_PUBLIC": "Публичная"
+	}
+}
diff --git a/plugins/nextcloud/langs/zh-CN.ini b/plugins/nextcloud/langs/zh-CN.ini
deleted file mode 100644
index 74e2dbf05..000000000
--- a/plugins/nextcloud/langs/zh-CN.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[NEXTCLOUD]
-SAVE_ATTACHMENTS = "保存到 Nextcloud"
-SAVE_EML = "以 .eml 文件保存到 Nextcloud"
-SAVE_ICS = "添加到日历"
-SELECT_FOLDER = "选择文件夹"
-SELECT_FILES = "选择文件"
-ATTACH_FILES = "添加 Nextcloud 文件"
-SELECT_CALENDAR = "选择日历"
-FILE_ATTACH = "attach"
-FILE_INTERNAL = "internal"
-FILE_PUBLIC = "public"
diff --git a/plugins/nextcloud/langs/zh-CN.json b/plugins/nextcloud/langs/zh-CN.json
new file mode 100644
index 000000000..fe29c38f2
--- /dev/null
+++ b/plugins/nextcloud/langs/zh-CN.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "保存到 Nextcloud",
+		"SAVE_EML": "以 .eml 文件保存到 Nextcloud",
+		"SAVE_ICS": "添加到日历",
+		"SELECT_FOLDER": "选择文件夹",
+		"SELECT_FILES": "选择文件",
+		"ATTACH_FILES": "添加 Nextcloud 文件",
+		"SELECT_CALENDAR": "选择日历",
+		"FILE_ATTACH": "attach",
+		"FILE_INTERNAL": "internal",
+		"FILE_PUBLIC": "public"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index 21e213c04..ef7ebcb79 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -435,10 +435,10 @@ class Manager
 					$aPLang = [];
 
 					// First get english
-					if (\is_file("{$sPath}en.ini")) {
-						$aPLang = \parse_ini_file("{$sPath}en.ini", true);
-					} else if (\is_file("{$sPath}en.json")) {
+					if (\is_file("{$sPath}en.json")) {
 						$aPLang = \json_decode(\file_get_contents("{$sPath}en.json"), true);
+					} else if (\is_file("{$sPath}en.ini")) {
+						$aPLang = \parse_ini_file("{$sPath}en.ini", true);
 					}
 					if ($aPLang) {
 						$aLang = \array_replace_recursive($aLang, $aPLang);
@@ -447,12 +447,15 @@ class Manager
 					// Now get native
 					if ('en' !== $sLang) {
 						$aPLang = [];
-						if (\is_file("{$sPath}{$sLang}.ini")) {
-							$aPLang = \parse_ini_file("{$sPath}{$sLang}.ini", true);
-						} else if (\is_file($sPath.\strtr($sLang,'-','_').'.ini')) {
-							$aPLang = \parse_ini_file($sPath.\strtr($sLang,'-','_').'.ini', true);
-						} else if (\is_file("{$sPath}{$sLang}.json")) {
+						if (\is_file("{$sPath}{$sLang}.json")) {
 							$aPLang = \json_decode(\file_get_contents("{$sPath}{$sLang}.json"), true);
+						} else {
+							if (!\is_file("{$sPath}{$sLang}.ini")) {
+								$sLang = \strtr($sLang, '-', '_');
+							}
+							if (\is_file("{$sPath}{$sLang}.ini")) {
+								$aPLang = \parse_ini_file("{$sPath}{$sLang}.ini", true);
+							}
 						}
 						if ($aPLang) {
 							$aLang = \array_replace_recursive($aLang, $aPLang);