mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 22:14:59 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Fix some language strings

Browse Source 
Newlines at end of email files

PHPBB3-11103
This commit is contained in:
Nathan Guse 2012-10-14 10:58:23 -05:00
parent c5f280351a
commit 716635c834
8 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/language/en/common.php
View File

@ -394,15 +394,15 @@ $lang = array_merge($lang, array(
'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".',
'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".',
'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".',
'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved because "%2$s".',
'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%2$s".',
'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
'NOTIFICATION_QUOTE' => '%1$s quoted you in the post "%2$s".',
'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" because "%3$s".',
'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" because "%3$s".',
'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".',
'NOTIFICATION_REPORT_CLOSED' => '%1$s closed the report you made for "%2$s".',
'NOTIFICATION_TOPIC' => '%1$s posted a new topic "%2$s" in the forum "%3$s".',
'NOTIFICATION_TOPIC_APPROVED' => 'Your topic "%2$s" in the forum "%3$s" was approved.',
'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved because "%2$s".',
'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved for reason: "%2$s".',
'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.',
'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',

4
phpBB/language/en/email/notifications/bookmark.txt
View File

@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
Hello {USERNAME},
You are receiving this notification because the topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}" has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
If you want to view the newest post made since your last visit, click the following link:
{U_NEWEST_POST}
@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
{U_NOTIFICATION_SETTINGS}
{EMAIL_SIG}
{EMAIL_SIG}

2
phpBB/language/en/email/notifications/post_in_queue.txt
View File

@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
{U_NOTIFICATION_SETTINGS}
{EMAIL_SIG}
{EMAIL_SIG}

2
phpBB/language/en/email/notifications/quote.txt
View File

@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies quoting you, please updat
{U_NOTIFICATION_SETTINGS}
{EMAIL_SIG}
{EMAIL_SIG}

2
phpBB/language/en/email/notifications/report_pm.txt
View File

@ -11,4 +11,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
{U_NOTIFICATION_SETTINGS}
{EMAIL_SIG}
{EMAIL_SIG}

2
phpBB/language/en/email/notifications/report_post.txt
View File

@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
{U_NOTIFICATION_SETTINGS}
{EMAIL_SIG}
{EMAIL_SIG}

2
phpBB/language/en/email/notifications/topic_in_queue.txt
View File

@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
{U_NOTIFICATION_SETTINGS}
{EMAIL_SIG}
{EMAIL_SIG}

6
phpBB/styles/prosilver/template/ajax.js
View File

@ -76,15 +76,11 @@ $('#qr_full_editor').click(function() {
});
});
/**
* Toggle notification list
*/
// Toggle notification list
$('#notification_list_button').click(function() {
$('#notification_list').toggle();
});
/**
* This AJAXifies the quick-mod tools. The reason it cannot be a standard
* callback / data attribute is that it requires filtering - some of the options