Merge https://github.com/fabrixxm/friendica into pull
Conflicts: util/messages.po
This commit is contained in:
friendica
commit
85876be48a
|
|
@ -41,8 +41,8 @@ function notification($params) {
|
|||
|
||||
$subject = sprintf( t('[Friendica:Notify] New mail received at %s'),$sitename);
|
||||
|
||||
$preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
|
||||
$epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]');
|
||||
$preamble = sprintf( t('%1$s sent you a new private message at %2$s.'),$params['source_name'],$sitename);
|
||||
$epreamble = sprintf( t('%1$s sent you %2$s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]');
|
||||
$sitelink = t('Please visit %s to view and/or reply to your private messages.');
|
||||
$tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] );
|
||||
$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message/' . $params['item']['id'] . '">' . $sitename . '</a>');
|
||||
|
|
@ -66,27 +66,38 @@ function notification($params) {
|
|||
);
|
||||
}
|
||||
|
||||
$possess_desc = str_replace('<!item_type!>',item_post_type($p[0]),$possess_desc);
|
||||
$item_post_type = item_post_type($p[0]);
|
||||
//$possess_desc = str_replace('<!item_type!>',$possess_desc);
|
||||
|
||||
// "a post"
|
||||
$dest_str = sprintf($possess_desc,'a');
|
||||
$dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'),
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
|
||||
$itemlink,
|
||||
$item_post_type);
|
||||
|
||||
// "George Bull's post"
|
||||
if($p)
|
||||
$dest_str = sprintf($possess_desc,sprintf( t("%s's"),$p[0]['author-name']));
|
||||
$dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
|
||||
$itemlink,
|
||||
$p[0]['author-name'],
|
||||
$item_post_type);
|
||||
|
||||
// "your post"
|
||||
if($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall'])
|
||||
$dest_str = sprintf($possess_desc, t('your') );
|
||||
$dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'),
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
|
||||
$itemlink,
|
||||
$item_post_type);
|
||||
|
||||
// Some mail softwares relies on subject field for threading.
|
||||
// So, we cannot have different subjects for notifications of the same thread.
|
||||
// Before this we have the name of the replier on the subject rendering
|
||||
// differents subjects for messages on the same thread.
|
||||
|
||||
$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%d by %s'), $parent_id, $params['source_name']);
|
||||
$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%1$d by %1$s'), $parent_id, $params['source_name']);
|
||||
$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']);
|
||||
$epreamble = sprintf( t('%s commented on %s.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . $dest_str . '[/url]');
|
||||
$epreamble = $dest_str;
|
||||
|
||||
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
|
||||
$tsitelink = sprintf( $sitelink, $siteurl );
|
||||
|
|
@ -97,9 +108,11 @@ function notification($params) {
|
|||
if($params['type'] == NOTIFY_WALL) {
|
||||
$subject = sprintf( t('[Friendica:Notify] %s posted to your profile wall') , $params['source_name']);
|
||||
|
||||
$preamble = sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename);
|
||||
$preamble = sprintf( t('%1$s posted to your profile wall at %1$s') , $params['source_name'], $sitename);
|
||||
|
||||
$epreamble = sprintf( t('%s posted to %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('your profile wall.') . '[/url]');
|
||||
$epreamble = sprintf( t('%1$s posted to [url=%2s]your wall[/url]') ,
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
|
||||
$itemlink);
|
||||
|
||||
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
|
||||
$tsitelink = sprintf( $sitelink, $siteurl );
|
||||
|
|
@ -109,8 +122,10 @@ function notification($params) {
|
|||
|
||||
if($params['type'] == NOTIFY_TAGSELF) {
|
||||
$subject = sprintf( t('[Friendica:Notify] %s tagged you') , $params['source_name']);
|
||||
$preamble = sprintf( t('%s tagged you at %s') , $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('%s %s.') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('tagged you') . '[/url]');
|
||||
$preamble = sprintf( t('%1$s tagged you at %2$s') , $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('%1$s [url=%2s]tagged you[/url].') ,
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
|
||||
$params['link']);
|
||||
|
||||
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
|
||||
$tsitelink = sprintf( $sitelink, $siteurl );
|
||||
|
|
@ -120,8 +135,10 @@ function notification($params) {
|
|||
|
||||
if($params['type'] == NOTIFY_TAGSHARE) {
|
||||
$subject = sprintf( t('[Friendica:Notify] %s tagged your post') , $params['source_name']);
|
||||
$preamble = sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('%s tagged %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('your post') . '[/url]' );
|
||||
$preamble = sprintf( t('%1$s tagged your post at %2$s') , $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('%1$s tagged [url=%2$s]your post[/url]') ,
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
|
||||
$itemlink);
|
||||
|
||||
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
|
||||
$tsitelink = sprintf( $sitelink, $siteurl );
|
||||
|
|
@ -131,8 +148,10 @@ function notification($params) {
|
|||
|
||||
if($params['type'] == NOTIFY_INTRO) {
|
||||
$subject = sprintf( t('[Friendica:Notify] Introduction received'));
|
||||
$preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('You\'ve received %s from %s.'), '[url=$itemlink]' . t('an introduction') . '[/url]' , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
|
||||
$preamble = sprintf( t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'),
|
||||
$itemlink,
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
|
||||
$body = sprintf( t('You may visit their profile at %s'),$params['source_link']);
|
||||
|
||||
$sitelink = t('Please visit %s to approve or reject the introduction.');
|
||||
|
|
@ -143,11 +162,12 @@ function notification($params) {
|
|||
|
||||
if($params['type'] == NOTIFY_SUGGEST) {
|
||||
$subject = sprintf( t('[Friendica:Notify] Friend suggestion received'));
|
||||
$preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('You\'ve received %s for %s from %s.'),
|
||||
'[url=$itemlink]' . t('a friend suggestion') . '[/url]',
|
||||
'[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]',
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
|
||||
$preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
|
||||
$epreamble = sprintf( t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'),
|
||||
$itemlink,
|
||||
'[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]',
|
||||
'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
|
||||
|
||||
$body = t('Name:') . ' ' . $params['item']['name'] . "\n";
|
||||
$body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n";
|
||||
$body .= sprintf( t('You may visit their profile at %s'),$params['item']['url']);
|
||||
|
|
|
|||
126
util/messages.po
126
util/messages.po
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1373\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-06-13 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-06-13 16:24-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -6947,12 +6947,12 @@ msgstr ""
|
|||
|
||||
#: ../../include/enotify.php:44
|
||||
#, php-format
|
||||
msgid "%s sent you a new private message at %s."
|
||||
msgid "%1$s sent you a new private message at %2$s."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:45
|
||||
#, php-format
|
||||
msgid "%s sent you %s."
|
||||
msgid "%1$s sent you %2$s."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:45
|
||||
|
|
@ -6964,148 +6964,128 @@ msgstr ""
|
|||
msgid "Please visit %s to view and/or reply to your private messages."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:76
|
||||
#: ../../include/enotify.php:73
|
||||
#, php-format
|
||||
msgid "%s's"
|
||||
msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:80
|
||||
msgid "your"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:87
|
||||
#, php-format
|
||||
msgid "[Friendica:Notify] Comment to conversation #%d by %s"
|
||||
msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:88
|
||||
#, php-format
|
||||
msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:98
|
||||
msgid "[Friendica:Notify] Comment to conversation #%1$d by %1$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:99
|
||||
#, php-format
|
||||
msgid "%s commented on an item/conversation you have been following."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:89
|
||||
#, php-format
|
||||
msgid "%s commented on %s."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:91 ../../include/enotify.php:104
|
||||
#: ../../include/enotify.php:115 ../../include/enotify.php:126
|
||||
#: ../../include/enotify.php:102 ../../include/enotify.php:117
|
||||
#: ../../include/enotify.php:130 ../../include/enotify.php:143
|
||||
#, php-format
|
||||
msgid "Please visit %s to view and/or reply to the conversation."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:98
|
||||
#: ../../include/enotify.php:109
|
||||
#, php-format
|
||||
msgid "[Friendica:Notify] %s posted to your profile wall"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:100
|
||||
#, php-format
|
||||
msgid "%s posted to your profile wall at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:102
|
||||
#, php-format
|
||||
msgid "%s posted to %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:102
|
||||
msgid "your profile wall."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:111
|
||||
#, php-format
|
||||
msgid "%1$s posted to your profile wall at %1$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:113
|
||||
#, php-format
|
||||
msgid "%1$s posted to [url=%2s]your wall[/url]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:124
|
||||
#, php-format
|
||||
msgid "[Friendica:Notify] %s tagged you"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:112
|
||||
#: ../../include/enotify.php:125
|
||||
#, php-format
|
||||
msgid "%s tagged you at %s"
|
||||
msgid "%1$s tagged you at %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:113
|
||||
#: ../../include/enotify.php:126
|
||||
#, php-format
|
||||
msgid "%s %s."
|
||||
msgid "%1$s [url=%2s]tagged you[/url]."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:113
|
||||
msgid "tagged you"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:122
|
||||
#: ../../include/enotify.php:137
|
||||
#, php-format
|
||||
msgid "[Friendica:Notify] %s tagged your post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:123
|
||||
#: ../../include/enotify.php:138
|
||||
#, php-format
|
||||
msgid "%s tagged your post at %s"
|
||||
msgid "%1$s tagged your post at %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:124
|
||||
#: ../../include/enotify.php:139
|
||||
#, php-format
|
||||
msgid "%s tagged %s"
|
||||
msgid "%1$s tagged [url=%2$s]your post[/url]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:124
|
||||
msgid "your post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:133
|
||||
#: ../../include/enotify.php:150
|
||||
msgid "[Friendica:Notify] Introduction received"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:134
|
||||
#: ../../include/enotify.php:151
|
||||
#, php-format
|
||||
msgid "You've received an introduction from '%s' at %s"
|
||||
msgid "You've received an introduction from '%1$s' at %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:135
|
||||
#: ../../include/enotify.php:152
|
||||
#, php-format
|
||||
msgid "You've received %s from %s."
|
||||
msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:135
|
||||
msgid "an introduction"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:136 ../../include/enotify.php:153
|
||||
#: ../../include/enotify.php:155 ../../include/enotify.php:173
|
||||
#, php-format
|
||||
msgid "You may visit their profile at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:138
|
||||
#: ../../include/enotify.php:157
|
||||
#, php-format
|
||||
msgid "Please visit %s to approve or reject the introduction."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:145
|
||||
#: ../../include/enotify.php:164
|
||||
msgid "[Friendica:Notify] Friend suggestion received"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:146
|
||||
#: ../../include/enotify.php:165
|
||||
#, php-format
|
||||
msgid "You've received a friend suggestion from '%s' at %s"
|
||||
msgid "You've received a friend suggestion from '%1$s' at %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:147
|
||||
#: ../../include/enotify.php:166
|
||||
#, php-format
|
||||
msgid "You've received %s for %s from %s."
|
||||
msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:148
|
||||
msgid "a friend suggestion"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:151
|
||||
#: ../../include/enotify.php:171
|
||||
msgid "Name:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:152
|
||||
#: ../../include/enotify.php:172
|
||||
msgid "Photo:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/enotify.php:155
|
||||
#: ../../include/enotify.php:175
|
||||
#, php-format
|
||||
msgid "Please visit %s to approve or reject the suggestion."
|
||||
msgstr ""
|
||||
|
|
@ -7173,7 +7153,7 @@ msgstr ""
|
|||
msgid "You have a new follower at "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/items.php:3444
|
||||
#: ../../include/items.php:3456
|
||||
msgid "Archives"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user