diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-01-04 20:36:37 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-01-04 20:36:37 +0100 |
| commit | a250419b5920e0c34f00e6744b066a81df155106 (patch) | |
| tree | 02e02675df5fe40733de3ee04af4b3942e501a96 /include | |
| parent | 291644f29d80670bdff8160b57c152c140bd8155 (diff) | |
| parent | d4e97ab64c22fe319b024ec60563bcf727d154fb (diff) | |
| download | volse-hubzilla-a250419b5920e0c34f00e6744b066a81df155106.tar.gz volse-hubzilla-a250419b5920e0c34f00e6744b066a81df155106.tar.bz2 volse-hubzilla-a250419b5920e0c34f00e6744b066a81df155106.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/connections.php | 2 | ||||
| -rw-r--r-- | include/js_strings.php | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/connections.php b/include/connections.php index bd41e112e..99a4cc71e 100644 --- a/include/connections.php +++ b/include/connections.php @@ -357,7 +357,7 @@ function contact_remove($channel_id, $abook_id) { call_hooks('connection_remove',$x); - $archive = get_pconfig($channel_id, 'system','archive_removed_contacts'); + $archive = get_pconfig($channel_id, 'system', 'archive_removed_contacts'); if($archive) { q("update abook set abook_archived = 1 where abook_id = %d and abook_channel = %d", intval($abook_id), diff --git a/include/js_strings.php b/include/js_strings.php index 6f559f4c4..e06e105fd 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -47,10 +47,10 @@ function js_strings() { 'days' => tt('%d days', '%d days', '%d'), 'months' => tt('%d months', '%d months', '%d'), 'years' => tt('%d years', '%d years', '%d'), - + // get plural function code 'plural_func' => tf(), - + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), @@ -113,6 +113,9 @@ function js_strings() { '$month' => t('month','calendar'), '$week' => t('week','calendar'), '$day' => t('day','calendar'), - '$allday' => t('All day','calendar') + '$allday' => t('All day','calendar'), + + // mod cloud + '$download_info' => t('Please stand by while your download is being prepared.') )); } |