Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c

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'),

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}}

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">

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">