Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

4 files changed, 31 insertions, 22 deletions

diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 38fa42fda..20afa3ffc 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -635,7 +635,7 @@ msgstr "Visible para conexiones específicas."
 #: ../../Zotlabs/Module/Share.php:118
 #, php-format
 msgid "🔁 Repeated %1$s's %2$s"
-msgstr "🔁 Repetidos %2$sde %1$s"
+msgstr "🔁 Repitió %2$sde %1$s"
 
 #: ../../include/items.php:3843 ../../addon/flashcards/Mod_Flashcards.php:291
 #: ../../addon/flashcards/Mod_Flashcards.php:292
@@ -2275,12 +2275,12 @@ msgstr "no gusta de %2$s de %1$s"
 #: ../../include/conversation.php:203
 #, php-format
 msgid "%1$s repeated %2$s's %3$s"
-msgstr "%1$scompartió %3$sde %2$s"
+msgstr "%1$s repitió %3$sde %2$s"
 
 #: ../../include/conversation.php:204
 #, php-format
 msgid "repeated %1$s's %2$s"
-msgstr "compartió %2$s de %1$s"
+msgstr "repitió %2$s de %1$s"
 
 #: ../../include/conversation.php:332 ../../Zotlabs/Lib/ThreadItem.php:532
 msgid "This is an unsaved preview"
@@ -2317,7 +2317,7 @@ msgstr "Quizá participe"
 #: ../../include/conversation.php:470
 msgctxt "title"
 msgid "Repeats"
-msgstr "Se repite"
+msgstr "Repite"
 
 #: ../../include/conversation.php:539
 msgid "Select"
@@ -2757,7 +2757,7 @@ msgid "Repeat"
 msgid_plural "Repeats"
 msgstr[0] "Se repite"
 msgstr[1] "Se repite"
-msgstr[2] "Se repite"
+msgstr[2] "Repite"
 
 #: ../../include/conversation.php:1556 ../../Zotlabs/Module/Photos.php:1134
 msgctxt "noun"
@@ -6853,7 +6853,7 @@ msgstr "no ha gustado de "
 
 #: ../../Zotlabs/Lib/Enotify.php:167
 msgid "repeated"
-msgstr "repetido / compartido"
+msgstr "repitió"
 
 #: ../../Zotlabs/Lib/Enotify.php:172
 msgid "voted on"
@@ -7391,11 +7391,11 @@ msgstr "compartir"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:345
 msgid "Repeat"
-msgstr "Se repite"
+msgstr "Repetir"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:345
 msgid "repeat"
-msgstr "Se repite"
+msgstr "repetir"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:356
 msgid "Delivery Report"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 6957ee3b7..31f5de315 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -2,8 +2,7 @@
 
 if(! function_exists("string_plural_select_es_es")) {
 function string_plural_select_es_es($n){
-                                        return ($n != 1 ? 1 : 0);
-}}
+        return ($n != 1 ? 1 : 0)}}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)";
 App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen.";
@@ -87,7 +86,7 @@ App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
 App::$strings["Visible to all connections."] = "Visible para todas las conexiones.";
 App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
 App::$strings["Visible to specific connections."] = "Visible para conexiones específicas.";
-App::$strings["🔁 Repeated %1\$s's %2\$s"] = "🔁 Repetidos %2\$sde %1\$s";
+App::$strings["🔁 Repeated %1\$s's %2\$s"] = "🔁 Repitió %2\$sde %1\$s";
 App::$strings["Item not found."] = "Elemento no encontrado.";
 App::$strings["Permission denied."] = "Acceso denegado.";
 App::$strings["Privacy group not found."] = "Grupo de canales no encontrado.";
@@ -468,15 +467,15 @@ App::$strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s";
 App::$strings["likes %1\$s's %2\$s"] = "gusta de %2\$s de %1\$s";
 App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s";
 App::$strings["doesn't like %1\$s's %2\$s"] = "no gusta de %2\$s de %1\$s";
-App::$strings["%1\$s repeated %2\$s's %3\$s"] = "%1\$scompartió %3\$sde %2\$s";
-App::$strings["repeated %1\$s's %2\$s"] = "compartió %2\$s de %1\$s";
+App::$strings["%1\$s repeated %2\$s's %3\$s"] = "%1\$s repitió %3\$sde %2\$s";
+App::$strings["repeated %1\$s's %2\$s"] = "repitió %2\$s de %1\$s";
 App::$strings["This is an unsaved preview"] = "Esta es una previsualización sin guardar";
 App::$strings["__ctx:title__ Likes"] = "Me gusta";
 App::$strings["__ctx:title__ Dislikes"] = "No me gusta";
 App::$strings["__ctx:title__ Attending"] = "Participaré";
 App::$strings["__ctx:title__ Not attending"] = "No participaré";
 App::$strings["__ctx:title__ Might attend"] = "Quizá participe";
-App::$strings["__ctx:title__ Repeats"] = "Se repite";
+App::$strings["__ctx:title__ Repeats"] = "Repite";
 App::$strings["Select"] = "Seleccionar";
 App::$strings["Delete"] = "Eliminar";
 App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada preferida";
@@ -574,7 +573,7 @@ App::$strings["Encrypt text"] = "Cifrar texto";
 App::$strings["__ctx:noun__ Repeat"] = array(
 	0 => "Se repite",
 	1 => "Se repite",
-	2 => "Se repite",
+	2 => "Repite",
 );
 App::$strings["__ctx:noun__ Dislike"] = array(
 	0 => "No me gusta",
@@ -1529,7 +1528,7 @@ App::$strings["requested to like"] = "solicita que se permita mostrar agrado ";
 App::$strings["liked"] = "ha gustado de ";
 App::$strings["requested to dislike"] = "solicita que se permita mostrar desagrado ";
 App::$strings["disliked"] = "no ha gustado de ";
-App::$strings["repeated"] = "repetido / compartido";
+App::$strings["repeated"] = "repitió";
 App::$strings["voted on"] = "votado en ";
 App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s ]un %4\$s[/zrl]";
 App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s[zrl=%3\$s]%5\$s de %4\$s[/zrl]";
@@ -1651,8 +1650,8 @@ App::$strings["Reply on this comment"] = "Responder a este comentario";
 App::$strings["reply"] = "responder";
 App::$strings["Reply to"] = "Responder a ";
 App::$strings["share"] = "compartir";
-App::$strings["Repeat"] = "Se repite";
-App::$strings["repeat"] = "Se repite";
+App::$strings["Repeat"] = "Repetir";
+App::$strings["repeat"] = "repetir";
 App::$strings["Delivery Report"] = "Informe de transmisión";
 App::$strings["%d comment"] = array(
 	0 => "%d comentario",
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
index 5022e7b1b..ba61a43ce 100644
--- a/view/tpl/help.tpl
+++ b/view/tpl/help.tpl
@@ -13,19 +13,19 @@
 				</div>
 			</div>
 		</div>
-		<h2>{{$title}}: {{$heading}}</h2>
+		<h2>{{$module->get_page_title()}}</h2>
 	</div>
 	<div class="section-content-wrapper" id="doco-content">
 		<h3 id="doco-top-toc-heading">
 			<span class="fakelink" onclick="docoTocToggle(); return false;">
 				<i class="fa fa-fw fa-caret-right fakelink" id="doco-toc-toggle"></i>
-				{{$tocHeading}}
+				{{$module->get_toc_heading()}}
 			</span>
 		</h3>
 		<ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul>
-		{{$content}}
+		{{$module->render_content()}}
 	</div>
 </div>
 <script>
-	var help_language = '{{$language}}'
+	var help_language = '{{$module->lang["language"]}}'
 </script>
diff --git a/view/tpl/widget.tpl b/view/tpl/widget.tpl
new file mode 100644
index 000000000..3fb3b1200
--- /dev/null
+++ b/view/tpl/widget.tpl
@@ -0,0 +1,10 @@
+{{* Generic template for widgets.
+  *
+  * To use this template, pass the `$this` object reference of the widget,
+  * and implement the `title()` and `contents()` functions as public methods
+  * on the widget class.
+  *}}
+<div class="widget">
+	<h3>{{$widget->title()}}</h3>
+	{{$widget->contents()}}
+</div>