From 561e8ec36c50b2ace9fe7352dfb4e11f57d0e82e Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 25 Nov 2016 14:55:19 +0100 Subject: better msg placement on angeltype view --- includes/view/AngelTypes_view.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/view/AngelTypes_view.php') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index a48f8d4c..04c0e286 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -49,7 +49,7 @@ function AngelType_delete_view($angeltype) { /** * Render angeltype edit form. - * + * * @param Angeltype $angeltype * The angeltype to edit * @param boolean $supporter_mode @@ -193,8 +193,8 @@ function AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes) */ function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angeltypes, $admin_angeltypes, $supporter, $user_driver_license, $user) { $page = [ - msg(), - AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user) + AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user), + msg() ]; $page[] = '

' . _("Description") . '

'; -- cgit v1.3.1 From 0401e90f005bf1292aee6f61d0a7970a1dc0da2b Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:23:49 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- locale/de_DE.UTF-8/LC_MESSAGES/default.po | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'includes/view/AngelTypes_view.php') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 04c0e286..318cd075 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by an archangel (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supprter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index e0838ecf..34c34707 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1710,8 +1710,8 @@ msgstr "News anlegen:" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29 -msgid "Ask the Heaven" -msgstr "Frage den Himmel" +msgid "Ask Heaven" +msgstr "Frag den Himmel" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:27 msgid "Unable to save question." @@ -1887,10 +1887,10 @@ msgstr "Benötigt Führerschein" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68 msgid "" -"Restricted angel types can only be used by an angel if enabled by an " -"archangel (double opt-in)." +"Restricted angel types can only be used by an angel if enabled by a" +"supporter (double opt-in)." msgstr "" -"Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator " +"Beschränkte Engeltypen müssen von einem Supporter " "freigeschaltet werden (double-opt-in)." #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69 -- cgit v1.3.1 From 10517213f6b6391721af36ccf99c3d0db8762966 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:33:07 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/view/AngelTypes_view.php') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 318cd075..0c8a4068 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a supprter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) -- cgit v1.3.1 From acbaaf4364ea03620397938cd05835d694b7ff78 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:43:22 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/view/AngelTypes_view.php') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 0c8a4068..270a423e 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a sup1porter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) -- cgit v1.3.1 From 687c3333224c6b8db7e5868f120871d6174d39b5 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:44:28 +0100 Subject: Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/view/AngelTypes_view.php') diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 270a423e..0c8a4068 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a sup1porter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) -- cgit v1.3.1