add missing strings for frio

diff --git a/include/conversation.php b/include/conversation.php
index c4d4fcdde80b57273093f3321007842eddb33b24..86b5ddc8d20b4e667e0ed2fad4412d364e12b291 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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'),
        ));
 
 

diff --git a/include/identity.php b/include/identity.php
index 136452e787b2e99fc6f745a3bfaec13be949752a..4dffe72559395f195dcc39757f12a5ac6eef534f 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -687,6 +687,8 @@ function advanced_profile(&$a) {
 
                return replace_macros($tpl, array(
                        '$title' => t('Profile'),
+                       '$basic' => t('Basic'),
+                       '$advanced' => t('Advanced'),
                        '$profile' => $profile
                ));
        }

diff --git a/mod/contacts.php b/mod/contacts.php
index 3d8b44b719c2e3ba933898e7afa876b6e05f8c7e..4eb435fc7550697abf23d6c4543140b08e31a616 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -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),
 
        ));

diff --git a/mod/editpost.php b/mod/editpost.php
index 9a80d0b2f4ba622badbaac42f617e973eeed926a..46a530dce09f49ec5da5058364aac0b88f4fe6df 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -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;

diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index 3253fc9b09b87de0b3326957d46edfaf68810aad..b731749e66373bf6e3a9b1093e743a1e7a32f9da 100644 (file)
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -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}}

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index c546757d84a5587e38c7889d44bb03336b58fad7..b1b022f06f4528beefd74899b4d5e6eb2de8cb8a 100644 (file)
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -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>

diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile_advanced.tpl
index d16025731373d4b39ebfcd98efaf4c09a311f08c..daa85154535ed487178ebcf2c0a2e674f117ebcf 100644 (file)
--- a/view/theme/frio/templates/profile_advanced.tpl
+++ b/view/theme/frio/templates/profile_advanced.tpl
@@ -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">

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 69f9267c2029b7b4ccd6b5fd06237e450f7de328..e1c2fd690844f2e5a8b2eac1aa18797e75015738 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -317,4 +317,4 @@ function frio_acl_lookup($a, &$results) {
                $results["items"] = $contacts;
                $results["tot"] = $total;
        }
-}
\ No newline at end of file
+}