friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1 

Small fix to translatable string
This commit is contained in:
Hypolite Petovan 2018-03-19 08:39:50 -04:00 committed by GitHub
parent 9c5f2ad0fc d9aca508cd
commit 7f01ee066c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/enotify.php
View File

@ -18,10 +18,10 @@ require_once 'include/html2bbcode.php';
* @brief Creates a notification entry and possibly sends a mail * @brief Creates a notification entry and possibly sends a mail
* *
* @param array $params Array with the elements: * @param array $params Array with the elements:
uid, item, parent, type, otype, verb, event, * uid, item, parent, type, otype, verb, event,
link, subject, body, to_name, to_email, source_name, * link, subject, body, to_name, to_email, source_name,
source_link, activity, preamble, notify_flags, * source_link, activity, preamble, notify_flags,
language, show_in_notification_page * language, show_in_notification_page
*/ */
function notification($params) function notification($params)
{ {
@ -370,7 +370,7 @@ function notification($params)
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]' '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
); );
$body = L10n::t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s ' . "\x28" . '%4$s' . "\x28", $body = L10n::t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s ' . "\x28" . '%4$s' . "\x29",
$params['source_name'], $params['source_name'],
$siteurl, $params['source_mail'], $siteurl, $params['source_mail'],
$params['source_nick'] $params['source_nick']

2
include/text.php
View File

@ -1062,7 +1062,7 @@ function linkify($s) {
* Load poke verbs * Load poke verbs
* *
* @return array index is present tense verb * @return array index is present tense verb
value is array containing past tense verb, translation of present, translation of past * value is array containing past tense verb, translation of present, translation of past
* @hook poke_verbs pokes array * @hook poke_verbs pokes array
*/ */
function get_poke_verbs() { function get_poke_verbs() {

2
mod/babel.php
View File

@ -39,7 +39,7 @@ function babel_content()
$o .= visible_lf($text) . EOL . EOL; $o .= visible_lf($text) . EOL . EOL;
$html = BBCode::convert($text); $html = BBCode::convert($text);
$o .= '<h2>' . L10n::t("bbcode \x28raw HTML\x28: ") . '</h2>' . EOL . EOL; $o .= '<h2>' . L10n::t("bbcode \x28raw HTML\x29: ") . '</h2>' . EOL . EOL;
$o .= htmlspecialchars($html) . EOL . EOL; $o .= htmlspecialchars($html) . EOL . EOL;
$o .= '<h2>' . L10n::t('bbcode: ') . '</h2>' . EOL . EOL; $o .= '<h2>' . L10n::t('bbcode: ') . '</h2>' . EOL . EOL;