aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-09-28 04:15:28 +0200
committerM. Dent <dentm42@gmail.com>2018-09-28 04:15:28 +0200
commit1e85c40c42946f84b5197056a2b71040071ec095 (patch)
tree065be02e297ba8da3b7f956b8896374ebe9dceb3 /Zotlabs
parentf72464a240b18f69fc203dc4f07553b3922a2cf0 (diff)
parent78ed1ae44623f58c4e9e2d6fd4d6a4ff322309fd (diff)
downloadvolse-hubzilla-1e85c40c42946f84b5197056a2b71040071ec095.tar.gz
volse-hubzilla-1e85c40c42946f84b5197056a2b71040071ec095.tar.bz2
volse-hubzilla-1e85c40c42946f84b5197056a2b71040071ec095.zip
Merge branch 'patch-9' into 'dev'
Add translation for new apps See merge request hubzilla/core!1289
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Apps.php19
1 files changed, 17 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 519d5f35a..aef6756b5 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -337,7 +337,20 @@ class Apps {
'Profiles' => t('Profiles'),
'Privacy Groups' => t('Privacy Groups'),
'Notifications' => t('Notifications'),
- 'Order Apps' => t('Order Apps')
+ 'Order Apps' => t('Order Apps'),
+ 'CalDAV' => t('CalDAV'),
+ 'CardDAV' => t('CardDAV'),
+ 'Channel Sources' => t('Channel Sources'),
+ 'Gallery' => t('Gallery'),
+ 'Guest Access' => t('Guest Access'),
+ 'Notes' => t('Notes'),
+ 'OAuth Apps Manager' => t('OAuth Apps Manager'),
+ 'OAuth2 Apps Manager' => t('OAuth2 Apps Manager'),
+ 'PDL Editor' => t('PDL Editor'),
+ 'Permission Categories' => t('Permission Categories'),
+ 'Premium Channel' => t('Premium Channel'),
+ 'Public Stream' => t('Public Stream'),
+ 'My Chatrooms' => t('My Chatrooms')
);
if(array_key_exists('name',$arr)) {
@@ -349,6 +362,9 @@ class Apps {
for($x = 0; $x < count($arr); $x++) {
if(array_key_exists($arr[$x]['name'],$apps)) {
$arr[$x]['name'] = $apps[$arr[$x]['name']];
+ } else {
+ // Try to guess by app name if not in list
+ $arr[$x]['name'] = t(trim($arr[$x]['name']));
}
}
}
@@ -763,7 +779,6 @@ class Apps {
call_hooks('app_list',$hookinfo);
$r = $hookinfo['apps'];
for($x = 0; $x < count($r); $x ++) {
- $r[$x]['app_name']=t(trim($r[$x]['app_name']));
if(! $r[$x]['app_system'])
$r[$x]['type'] = 'personal';
$r[$x]['term'] = q("select * from term where otype = %d and oid = %d",