Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / view / theme / frost-mobile / templates / settings.tpl

diff --git a/view/theme/frost-mobile/templates/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl
index 16a67039b25f9beb1233a4d37ac2084a4b34ba7e..e3a636a840467b45aa9c8aa6221a1a39cb04cfd6 100644 (file)
--- a/view/theme/frost-mobile/templates/settings.tpl
+++ b/view/theme/frost-mobile/templates/settings.tpl
@@ -1,8 +1,4 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
@@ -31,6 +27,7 @@
 {{include file="field_input.tpl" field=$email}}
 {{include file="field_password.tpl" field=$password4}}
 {{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_select.tpl" field=$language}}
 {{include file="field_input.tpl" field=$defloc}}
 {{include file="field_checkbox.tpl" field=$allowloc}}
 
@@ -89,7 +86,7 @@
        <div id="settings-default-perms-menu-end"></div>
 
 {{*<!--        <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->*}}
-       
+
        <div style="display: none;">
                <div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
                        {{$aclselect}}
@@ -133,6 +130,8 @@
 {{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
+{{include file="field_checkbox.tpl" field=$email_textonly}}
+
 </div>
 
 <div class="settings-submit-wrapper" >