GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source 
* '1.0.x' of gitorious.org:statusnet/mainline: (31 commits)
  Enable TinyMCE for the blog form
  upgrade TinyMCE to 3.4.x
  correctly purify input for Blog_entry
  better management of HTML input
  correctly return the HTML representation of a new blog entry
  Fine-tuning Blog_entry class
  don't double-show summary and content
  move class BlogEntry to Blog_entry for DB_DataObject compliance
  get right output context for BlogEntryListItem
  correct staticGet() declaration
  First coded version of blog plugin
  push regex pattern for UUID to that class
  Localisation updates from http://translatewiki.net.
  Document a few messages I missed.
  Add translator documentation. Broke a few long lines. i18n/L10n updates. Whitespace updates.
  Localisation updates from http://translatewiki.net.
  Add missing translator documentation.
  Update translator documentation. Whitespace updates.
  Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced. Whitespace updates.
  Add translator documentation.
  ...

Conflicts:
	plugins/EmailReminder/EmailReminderPlugin.php
	plugins/EmailReminder/lib/userinvitereminderhandler.php
This commit is contained in:
Zach Copley
2011-06-20 13:14:19 -07:00
parent aebab2742a 182a8cf377
commit 29403a764c
1611 changed files with 43219 additions and 31052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/EmailReminder/EmailReminderPlugin.php
View File

@@ -207,6 +207,7 @@ class EmailReminderPlugin extends Plugin
'version' => STATUSNET_VERSION,
'author' => 'Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:EmailReminder',
// TRANS: Plugin description.
'rawdescription' => _m('Send email reminders for various things.')
);
return true;

2
plugins/EmailReminder/classes/Email_reminder.php
View File

@@ -46,7 +46,6 @@ class Email_reminder extends Managed_DataObject
* @param mixed $v Value to lookup
*
* @return QnA_Answer object found, or null for no hits
*
*/
function staticGet($k, $v=null)
{
@@ -100,6 +99,7 @@ class Email_reminder extends Managed_DataObject
if (empty($result)) {
common_log_db_error($reminder, 'INSERT', __FILE__);
throw new ServerException(
// TRANS: Server exception thrown when a reminder record could not be inserted into the database.
_m('Database error inserting reminder record.')
);
}

12
plugins/EmailReminder/lib/userconfirmregreminderhandler.php
View File

@@ -1,5 +1,4 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
*
@@ -26,6 +25,7 @@
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
exit(1);
}
@@ -99,7 +99,8 @@ class UserConfirmRegReminderHandler extends UserReminderHandler {
case ($days > 1 && $days < 2):
if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm, 1)) {
common_log(LOG_INFO, "Sending one day registration confirmation reminder to {$confirm->address}", __FILE__);
$subject = _m("Reminder - please confirm your registration!");
// TRANS: Subject for reminder e-mail.
$subject = _m('Reminder - please confirm your registration!');
return EmailReminderPlugin::sendReminder(
self::REGISTER_REMINDER,
$confirm,
@@ -113,7 +114,8 @@ class UserConfirmRegReminderHandler extends UserReminderHandler {
case ($days > 3 && $days < 4):
if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm, 3)) {
common_log(LOG_INFO, "Sending three day registration confirmation reminder to {$confirm->address}", __FILE__);
$subject = _m("Second reminder - please confirm your registration!");
// TRANS: Subject for reminder e-mail.
$subject = _m('Second reminder - please confirm your registration!');
return EmailReminderPlugin::sendReminder(
self::REGISTER_REMINDER,
$confirm,
@@ -127,7 +129,8 @@ class UserConfirmRegReminderHandler extends UserReminderHandler {
case ($days > 7 && $days < 8):
if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm, 7)) {
common_log(LOG_INFO, "Sending one week registration confirmation reminder to {$confirm->address}", __FILE__);
$subject = _m("Final reminder - please confirm your registration!");
// TRANS: Subject for reminder e-mail.
$subject = _m('Final reminder - please confirm your registration!');
return EmailReminderPlugin::sendReminder(
self::REGISTER_REMINDER,
$confirm,
@@ -141,5 +144,4 @@ class UserConfirmRegReminderHandler extends UserReminderHandler {
}
return true;
}
}

8
plugins/EmailReminder/lib/userinvitereminderhandler.php
View File

@@ -25,6 +25,7 @@
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
exit(1);
}
@@ -97,7 +98,8 @@ class UserInviteReminderHandler extends UserReminderHandler {
case ($days > 1 && $days < 2):
if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation, 1)) {
common_log(LOG_INFO, "Sending one day invitation reminder to {$invitation->address}", __FILE__);
$subject = _m("Reminder - you have been invited to join {$siteName}!");
// TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
$subject = sprintf(_m('Reminder - You have been invited to join %s!'),$siteName);
return EmailReminderPlugin::sendReminder(
self::INVITE_REMINDER,
$invitation,
@@ -110,7 +112,8 @@ class UserInviteReminderHandler extends UserReminderHandler {
case ($days > 3 && $days < 4):
if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation, 3)) {
common_log(LOG_INFO, "Sending three day invitation reminder to {$invitation->address}", __FILE__);
$subject = _m("Final reminder - you have been invited to join {$siteName}!");
// TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
$subject = sprintf(_m('Final reminder - you have been invited to join %s!'),$siteName);
return EmailReminderPlugin::sendReminder(
self::INVITE_REMINDER,
$invitation,
@@ -124,5 +127,4 @@ class UserInviteReminderHandler extends UserReminderHandler {
}
return true;
}
}

3
plugins/EmailReminder/lib/userreminderhandler.php
View File

@@ -1,5 +1,4 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
*
@@ -25,6 +24,7 @@
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
exit(1);
}
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
* @link http://status.net/
*/
class UserReminderHandler extends QueueHandler {
/**
* Send the next email reminder to the confirm address
*

54
plugins/EmailReminder/locale/EmailReminder.pot Normal file
View File

@@ -0,0 +1,54 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-19 11:06+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. TRANS: Plugin description.
#: EmailReminderPlugin.php:205
msgid "Send email reminders for various things."
msgstr ""
#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
#: classes/Email_reminder.php:100
msgid "Database error inserting reminder record."
msgstr ""
#. TRANS: Subject for reminder e-mail.
#: lib/userconfirmregreminderhandler.php:85
msgid "Reminder - please confirm your registration!"
msgstr ""
#. TRANS: Subject for reminder e-mail.
#: lib/userconfirmregreminderhandler.php:99
msgid "Second reminder - please confirm your registration!"
msgstr ""
#. TRANS: Subject for reminder e-mail.
#: lib/userconfirmregreminderhandler.php:114
msgid "Final reminder - please confirm your registration!"
msgstr ""
#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
#: lib/userinvitereminderhandler.php:84
#, php-format
msgid "Reminder - You have been invited to join %s!"
msgstr ""
#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
#: lib/userinvitereminderhandler.php:98
#, php-format
msgid "Final reminder - you have been invited to join %s!"
msgstr ""

52
plugins/EmailReminder/locale/mk/LC_MESSAGES/EmailReminder.po Normal file
View File

@@ -0,0 +1,52 @@
# Translation of StatusNet - EmailReminder to Macedonian (Македонски)
# Exported from translatewiki.net
#
# Author: Bjankuloski06
# --
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet - EmailReminder\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-19 11:06+0000\n"
"PO-Revision-Date: 2011-06-19 11:07:22+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-06-18 16:03:47+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90375); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
#. TRANS: Plugin description.
msgid "Send email reminders for various things."
msgstr "Испраќај потсетници за разни нешта по е-пошта."
#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
msgid "Database error inserting reminder record."
msgstr "Грешка во базата при вметнувањето на евиденцијата за потсетување."
#. TRANS: Subject for reminder e-mail.
msgid "Reminder - please confirm your registration!"
msgstr "Потсетување - потврдете ја Вашата регистрација!"
#. TRANS: Subject for reminder e-mail.
msgid "Second reminder - please confirm your registration!"
msgstr "Последно потсетување - потврдете ја Вашата регистрација!"
#. TRANS: Subject for reminder e-mail.
msgid "Final reminder - please confirm your registration!"
msgstr "Последно потсетување - потврдете ја Вашата регистрација!"
#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
#, php-format
msgid "Reminder - You have been invited to join %s!"
msgstr ""
#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
#, php-format
msgid "Final reminder - you have been invited to join %s!"
msgstr ""

54
plugins/EmailReminder/locale/nl/LC_MESSAGES/EmailReminder.po Normal file
View File

@@ -0,0 +1,54 @@
# Translation of StatusNet - EmailReminder to Dutch (Nederlands)
# Exported from translatewiki.net
#
# Author: Siebrand
# --
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet - EmailReminder\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-19 11:06+0000\n"
"PO-Revision-Date: 2011-06-19 11:07:22+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-06-18 16:03:47+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90375); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANS: Plugin description.
msgid "Send email reminders for various things."
msgstr "E-mailherinnering verzenden voor verschillende dingen."
#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
msgid "Database error inserting reminder record."
msgstr ""
"Er is een databasefout opgetreden tijdens het invoegen van een "
"herinneringsrecord."
#. TRANS: Subject for reminder e-mail.
msgid "Reminder - please confirm your registration!"
msgstr "Herinnering - bevestig uw registratie!"
#. TRANS: Subject for reminder e-mail.
msgid "Second reminder - please confirm your registration!"
msgstr "Tweede herinnering - bevestig uw registratie!"
#. TRANS: Subject for reminder e-mail.
msgid "Final reminder - please confirm your registration!"
msgstr "Laatste herinnering - bevestig uw registratie!"
#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
#, php-format
msgid "Reminder - You have been invited to join %s!"
msgstr ""
#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
#, php-format
msgid "Final reminder - you have been invited to join %s!"
msgstr ""