From 5fe1ab0758bdee9d1aff45d8825bff70bf5d0b21 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 1 Sep 2021 10:54:56 +0200
Subject: [PATCH 1/3] missing $ in template

The admin/site.tpl file had a missing $ from a variable name thus Smarty
could not compile the template.
---
 view/templates/admin/site.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index dfa8e21a95..ff06404697 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -72,7 +72,7 @@
 		{{else}}
 			<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
 				<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-				<span class="field_help" role="tooltip" id="id_{{diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
+				<span class="field_help" role="tooltip" id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
 			</div>
 		{{/if}}
 		{{include file="field_input.tpl" field=$global_directory}}

From 728e82d8b076cddac451e7db932a79397e443bfb Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 1 Sep 2021 14:00:23 +0200
Subject: [PATCH 2/3] Improve translation for Storage module

---
 src/Module/Admin/Storage.php                | 2 ++
 view/templates/admin/storage.tpl            | 4 ++--
 view/theme/frio/templates/admin/storage.tpl | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index a2172503f5..c57bdccc1a 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -129,6 +129,8 @@ class Storage extends BaseAdmin
 
 		return Renderer::replaceMacros($t, [
 			'$title'                 => DI::l10n()->t('Administration'),
+			'$label_current'         => DI::l10n()->t('Current Storage Backend'),
+			'$label_config'          => DI::l10n()->t('Storage Configuration'),
 			'$page'                  => DI::l10n()->t('Storage'),
 			'$save'                  => DI::l10n()->t('Save'),
 			'$save_activate'         => DI::l10n()->t('Save & Activate'),
diff --git a/view/templates/admin/storage.tpl b/view/templates/admin/storage.tpl
index 299ec8db46..e56038359e 100644
--- a/view/templates/admin/storage.tpl
+++ b/view/templates/admin/storage.tpl
@@ -1,9 +1,9 @@
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
-		<h2>Current Storage Backend: <b>{{$storagebackend}}</b></h2>
+		<h2>{{$label_current}}: <b>{{$storagebackend}}</b></h2>
 
-		<h2>Storage Configuration</h2>
+		<h2>{{$label_config}}</h2>
 
 		{{foreach from=$availablestorageforms item=$storage}}
 	<form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post">
diff --git a/view/theme/frio/templates/admin/storage.tpl b/view/theme/frio/templates/admin/storage.tpl
index 7607a08485..5239821797 100644
--- a/view/theme/frio/templates/admin/storage.tpl
+++ b/view/theme/frio/templates/admin/storage.tpl
@@ -4,10 +4,10 @@
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<div class="well well-lg">
-			Current Storage Backend: <b>{{$storagebackend}}</b>
+        	{{$label_current}}: <b>{{$storagebackend}}</b>
 	</div>
 
-		<h2>Storage Configuration</h2>
+		<h2>{{$label_config}}</h2>
 
 		{{foreach from=$availablestorageforms item=$storage}}
 	<form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post">

From 23a1fa18c817fc51b7b25edc3b3bb6ef5b3c0e05 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 1 Sep 2021 14:02:04 +0200
Subject: [PATCH 3/3] Update messages.po

---
 view/lang/C/messages.po | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 0c1247b31f..24ca48c05f 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.09-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-31 19:52+0000\n"
+"POT-Creation-Date: 2021-09-01 14:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -895,7 +895,7 @@ msgid "Edit post"
 msgstr ""
 
 #: mod/editpost.php:91 mod/notes.php:56 src/Content/Text/HTML.php:885
-#: src/Module/Admin/Storage.php:133 src/Module/Filer/SaveTag.php:69
+#: src/Module/Admin/Storage.php:135 src/Module/Filer/SaveTag.php:69
 msgid "Save"
 msgstr ""
 
@@ -6523,27 +6523,35 @@ msgstr ""
 msgid "Invalid storage backend setting value."
 msgstr ""
 
-#: src/Module/Admin/Storage.php:132 src/Module/BaseAdmin.php:91
+#: src/Module/Admin/Storage.php:132
+msgid "Current Storage Backend"
+msgstr ""
+
+#: src/Module/Admin/Storage.php:133
+msgid "Storage Configuration"
+msgstr ""
+
+#: src/Module/Admin/Storage.php:134 src/Module/BaseAdmin.php:91
 msgid "Storage"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:134
+#: src/Module/Admin/Storage.php:136
 msgid "Save & Activate"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:135
+#: src/Module/Admin/Storage.php:137
 msgid "Activate"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:136
+#: src/Module/Admin/Storage.php:138
 msgid "Save & Reload"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:137
+#: src/Module/Admin/Storage.php:139
 msgid "This backend doesn't have custom settings"
 msgstr ""
 
-#: src/Module/Admin/Storage.php:140
+#: src/Module/Admin/Storage.php:142
 msgid "Database (legacy)"
 msgstr ""