bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #2636 from rabuzarus/2506_frio_strings

Browse source 
add missing strings for frio
This commit is contained in:
Michael Vogel 2016-06-25 14:03:34 +02:00 committed by GitHub
parent 9c2446c53c 073f520cee
commit ad6b3f8815
8 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -1282,6 +1282,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$private' => t('Private post'),
'$is_private' => $private_post,
'$public_link' => $public_post_link,
//jot nav tab (used in some themes)
'$message' => t('Message'),
'$browser' => t('Browser'),
));

2
include/identity.php
View file

@ -687,6 +687,8 @@ function advanced_profile(&$a) {
return replace_macros($tpl, array(
'$title' => t('Profile'),
'$basic' => t('Basic'),
'$advanced' => t('Advanced'),
'$profile' => $profile
));
}

1
mod/contacts.php
View file

@ -800,6 +800,7 @@ function contacts_content(&$a) {
"contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
"contacts_batch_drop" => t('Delete'),
),
'$h_batch_actions' => t('Batch Actions'),
'$paginate' => paginate($a),
));

7
mod/editpost.php
View file

@ -146,7 +146,12 @@ function editpost_content(&$a) {
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
'$cancel' => t('Cancel'),
'$rand_num' => random_digits(12)
'$rand_num' => random_digits(12),
//jot nav tab (used in some themes)
'$message' => t('Message'),
'$browser' => t('Browser'),
'$shortpermset' => t('permissions'),
));
return $o;

2
view/theme/frio/templates/contacts-template.tpl
View file

@ -37,7 +37,7 @@
<ul class="nav nav-pills preferences">
<li class="dropdown pull-right">
<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-angle-down"></i> Batch Actions{{* Does need a Translation and a Variable in core*}}
<i class="fa fa-angle-down"></i>&nbsp;{{$h_batch_actions}}
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="BatchActionDropdownMenuTools">
{{foreach $batch_actions as $n=>$l}}

18
view/theme/frio/templates/jot.tpl
View file

@ -71,7 +71,13 @@
</div>
<!-- Modal -->
{{* The jot modal - We use a own modal for the jot and not the standard modal
from the page template. This is because the special structure of the jot
(e.g.jot navigation tabs in the modal titel area).
The in the frio theme the jot will loaded regulary and is hidden by default.)
The js function jotShow() loads the jot into the modal. With this structure we
can load different content into the jot moadl (e.g. the item edit jot)
*}}
<div id="jot-modal" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
@ -83,10 +89,10 @@
<ul class="nav nav-tabs hidden-xs jot-nav" role="menubar" data-tabs="tabs">
{{* Mark the first list entry as active because it is the first which is active after opening
the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<li class="active" role="menuitem"><a id="jot-text-lnk" onclick="jotActive(); return false;">Text</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk" onclick="aclActive();return false;">Permissions</a></li>{{/if}}
<li class="active" role="menuitem"><a id="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
<li role="menuitem"><a id="jot-preview-link" onclick="fbrowserActive(); return false;"> Browser </a></li>
<li role="menuitem"><a id="jot-preview-link" onclick="fbrowserActive(); return false;">{{$browser}}</a></li>
</ul>
<div class="dropdown hidden-lg hidden-md hidden-sm" role="menubar" data-tabs="tabs">
@ -95,8 +101,8 @@
<ul class="dropdown-menu nav nav-pills">
{{* mark the first list entry as active because it is the first which is active after opening
the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<li class="active" role="menuitem"><a id="jot-text-lnk-mobile" onclick="jotActive(); return false;">Text</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk-mobile" onclick="aclActive();return false;">Permissions</a></li>{{/if}}
<li class="active" role="menuitem"><a id="jot-text-lnk-mobile" onclick="jotActive(); return false;">{{$message}}</a></li>
{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk-mobile" onclick="aclActive();return false;"{{$shortpermset}}</a></li>{{/if}}
{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk-mobile" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
</ul>
</div>

4
view/theme/frio/templates/profile_advanced.tpl
View file

@ -22,8 +22,8 @@
<h3 class="">{{$title}}</h3>
<ul id="profile-menu" class="nav nav-tabs" role="menubar" data-tabs="tabs">
<li class="active" role="menuitem"><a id="profile-tab-standard-link" onclick="profileStandardActive(); return false;">Standard</a></li>
<li role="menuitem"><a id="profile-tab-advanced-link" onclick="profileAdvancedActive(); return false;">Advanced</a></li>
<li class="active" role="menuitem"><a id="profile-tab-standard-link" onclick="profileStandardActive(); return false;">{{$basic}}</a></li>
<li role="menuitem"><a id="profile-tab-advanced-link" onclick="profileAdvancedActive(); return false;">{{$advanced}}</a></li>
</ul>
<div id="profile-content-standard">

2
view/theme/frio/theme.php
View file

@ -317,4 +317,4 @@ function frio_acl_lookup($a, &$results) {
$results["items"] = $contacts;
$results["tot"] = $total;
}
}
}