Add translation to Yourself option in view as select in profile

- Address https://github.com/friendica/friendica/issues/9682

diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index b1e0673b242496ce8366511466dfbb4a5ff5b92c..6b7da3d716ce6e93d49ca3dcd04ed7b349a5b475 100644 (file)
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -231,9 +231,10 @@ class Profile extends BaseProfile
                        );
                }
 
-               $tpl = Renderer::getMarkupTemplate('profile/index.tpl');
+               $tpl = Renderer::getMarkupTemplate('profile/profile.tpl');
                $o .= Renderer::replaceMacros($tpl, [
                        '$title' => DI::l10n()->t('Profile'),
+                       '$yourself' => DI::l10n()->t('Yourself'),
                        '$view_as_contacts' => $view_as_contacts,
                        '$view_as_contact_id' => $view_as_contact_id,
                        '$view_as_contact_alert' => $view_as_contact_alert,

diff --git a/view/templates/profile/index.tpl b/view/templates/profile/index.tpl
deleted file mode 100644 (file)
index 36b64ff..0000000
--- a/view/templates/profile/index.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-{{if $view_as_contact_alert}}
-<div class="alert alert-info" role="alert">
-       {{$view_as_contact_alert nofilter}}
-</div>
-{{/if}}
-<div id="profile-page" class="generic-page-wrapper">
-    {{include file="section_title.tpl"}}
-
-    {{* The link to edit the profile*}}
-{{if $is_owner}}
-       <div id="profile-edit-links">
-               <ul class="nav nav-pills preferences">
-                       <li class="pull-right">
-                               <a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$edit_link.url}}" title="{{$edit_link.title}}">
-                                       <i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$edit_link.label}}
-                               </a>
-                       </li>
-                       <li class="pull-right">
-                               <a class="btn btn-link btn-sm" type="button" id="profile-viewas-link" href="{{$viewas_link.url}}" title="{{$viewas_link.title}}">
-                                       <i class="fa fa-eye" aria-hidden="true"></i>&nbsp;{{$viewas_link.label}}
-                               </a>
-                       </li>
-               </ul>
-               <div class="clear"></div>
-       </div>
-{{/if}}
-       <dl id="{{$basic_fields.fullname.id}}" class="row {{$basic_fields.fullname.class|default:'aprofile'}}">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.fullname.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.fullname.value}}</dd>
-       </dl>
-
-{{if $basic_fields.membersince}}
-       <dl id="aprofile-membersince" class="row {{$basic_fields.membersince.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.membersince.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.membersince.value}}</dd>
-       </dl>
-{{/if}}
-
-{{if $basic_fields.birthday}}
-       <dl id="aprofile-birthday" class="row {{$basic_fields.birthday.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.birthday.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.birthday.value}}</dd>
-       </dl>
-{{/if}}
-
-{{if $basic_fields.age}}
-       <dl id="aprofile-age" class="row {{$basic_fields.age.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.age.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.age.value}}</dd>
-       </dl>
-{{/if}}
-
-{{if $basic_fields.location}}
-       <dl id="aprofile-location" class="row {{$basic_fields.location.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.location.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.location.value}}</dd>
-       </dl>
-{{/if}}
-
-{{if $basic_fields.homepage}}
-       <dl id="aprofile-homepage" class="row {{$basic_fields.homepage.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.homepage.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.homepage.value nofilter}}</dd>
-       </dl>
-{{/if}}
-
-{{if $basic_fields.xmpp}}
-       <dl id="aprofile-xmpp" class="row {{$basic_fields.xmpp.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.xmpp.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.xmpp.value nofilter}}</dd>
-       </dl>
-{{/if}}
-
-{{if $basic_fields.pub_keywords}}
-       <dl id="aprofile-tags" class="row {{$basic_fields.pub_keywords.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.pub_keywords.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">
-            {{foreach $basic_fields.pub_keywords.value as $tag}}
-                               <a href="{{$tag.url}}" class="tag label btn-info sm">{{$tag.label}} <i class="fa fa-bolt" aria-hidden="true"></i></a>
-            {{/foreach}}
-               </dd>
-       </dl>
-{{/if}}
-
-{{foreach $custom_fields as $custom_field}}
-       <dl id="{{$custom_field.id}}" class="row {{$custom_field.class|default:'aprofile'}}">
-               <hr class="profile-separator">
-               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$custom_field.label}}</dt>
-               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$custom_field.value nofilter}}</dd>
-       </dl>
-{{/foreach}}
-</div>
-{{if $is_owner}}
-<form action="{{$query_string}}" method="get" id="viewas" class="panel panel-default form-inline">
-       <fieldset class="panel-body">
-               <label for="viewas-select">{{$view_as}}</label>
-               <select name="viewas" id="viewas-select" class="form-control">
-                       <option value="0">Yourself</option>
-                       {{foreach $view_as_contacts as $contact}}
-                               <option value="{{$contact.id}}"{{if $contact.id == $view_as_contact_id}} selected{{/if}}>{{$contact.name}}</option>
-                       {{/foreach}}
-               </select>
-               <button type="submit" class="btn btn-primary">{{$submit}}</button>
-       </fieldset>
-</form>
-{{/if}}

diff --git a/view/templates/profile/profile.tpl b/view/templates/profile/profile.tpl
new file mode 100644 (file)
index 0000000..c2cb3ea
--- /dev/null
+++ b/view/templates/profile/profile.tpl
@@ -0,0 +1,113 @@
+{{if $view_as_contact_alert}}
+<div class="alert alert-info" role="alert">
+       {{$view_as_contact_alert nofilter}}
+</div>
+{{/if}}
+<div id="profile-page" class="generic-page-wrapper">
+    {{include file="section_title.tpl"}}
+
+    {{* The link to edit the profile*}}
+{{if $is_owner}}
+       <div id="profile-edit-links">
+               <ul class="nav nav-pills preferences">
+                       <li class="pull-right">
+                               <a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$edit_link.url}}" title="{{$edit_link.title}}">
+                                       <i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$edit_link.label}}
+                               </a>
+                       </li>
+                       <li class="pull-right">
+                               <a class="btn btn-link btn-sm" type="button" id="profile-viewas-link" href="{{$viewas_link.url}}" title="{{$viewas_link.title}}">
+                                       <i class="fa fa-eye" aria-hidden="true"></i>&nbsp;{{$viewas_link.label}}
+                               </a>
+                       </li>
+               </ul>
+               <div class="clear"></div>
+       </div>
+{{/if}}
+       <dl id="{{$basic_fields.fullname.id}}" class="row {{$basic_fields.fullname.class|default:'aprofile'}}">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.fullname.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.fullname.value}}</dd>
+       </dl>
+
+{{if $basic_fields.membersince}}
+       <dl id="aprofile-membersince" class="row {{$basic_fields.membersince.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.membersince.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.membersince.value}}</dd>
+       </dl>
+{{/if}}
+
+{{if $basic_fields.birthday}}
+       <dl id="aprofile-birthday" class="row {{$basic_fields.birthday.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.birthday.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.birthday.value}}</dd>
+       </dl>
+{{/if}}
+
+{{if $basic_fields.age}}
+       <dl id="aprofile-age" class="row {{$basic_fields.age.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.age.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.age.value}}</dd>
+       </dl>
+{{/if}}
+
+{{if $basic_fields.location}}
+       <dl id="aprofile-location" class="row {{$basic_fields.location.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.location.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.location.value}}</dd>
+       </dl>
+{{/if}}
+
+{{if $basic_fields.homepage}}
+       <dl id="aprofile-homepage" class="row {{$basic_fields.homepage.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.homepage.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.homepage.value nofilter}}</dd>
+       </dl>
+{{/if}}
+
+{{if $basic_fields.xmpp}}
+       <dl id="aprofile-xmpp" class="row {{$basic_fields.xmpp.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.xmpp.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.xmpp.value nofilter}}</dd>
+       </dl>
+{{/if}}
+
+{{if $basic_fields.pub_keywords}}
+       <dl id="aprofile-tags" class="row {{$basic_fields.pub_keywords.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.pub_keywords.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">
+            {{foreach $basic_fields.pub_keywords.value as $tag}}
+                               <a href="{{$tag.url}}" class="tag label btn-info sm">{{$tag.label}} <i class="fa fa-bolt" aria-hidden="true"></i></a>
+            {{/foreach}}
+               </dd>
+       </dl>
+{{/if}}
+
+{{foreach $custom_fields as $custom_field}}
+       <dl id="{{$custom_field.id}}" class="row {{$custom_field.class|default:'aprofile'}}">
+               <hr class="profile-separator">
+               <dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$custom_field.label}}</dt>
+               <dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$custom_field.value nofilter}}</dd>
+       </dl>
+{{/foreach}}
+</div>
+{{if $is_owner}}
+<form action="{{$query_string}}" method="get" id="viewas" class="panel panel-default form-inline">
+       <fieldset class="panel-body">
+               <label for="viewas-select">{{$view_as}}</label>
+               <select name="viewas" id="viewas-select" class="form-control">
+                       <option value="0">{{$yourself}}</option>
+                       {{foreach $view_as_contacts as $contact}}
+                               <option value="{{$contact.id}}"{{if $contact.id == $view_as_contact_id}} selected{{/if}}>{{$contact.name}}</option>
+                       {{/foreach}}
+               </select>
+               <button type="submit" class="btn btn-primary">{{$submit}}</button>
+       </fieldset>
+</form>
+{{/if}}