diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/language.php | 16 | ||||
| -rw-r--r-- | lib/mail.php | 4 | ||||
| -rw-r--r-- | lib/repeatform.php | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lib/language.php b/lib/language.php index d8f529201..f5ee7fac5 100644 --- a/lib/language.php +++ b/lib/language.php @@ -32,6 +32,21 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +// Locale category constants are usually predefined, but may not be +// on some systems such as Win32. +$LC_CATEGORIES = array('LC_CTYPE', + 'LC_NUMERIC', + 'LC_TIME', + 'LC_COLLATE', + 'LC_MONETARY', + 'LC_MESSAGES', + 'LC_ALL'); +foreach ($LC_CATEGORIES as $key => $name) { + if (!defined($name)) { + define($name, $key); + } +} + if (!function_exists('gettext')) { require_once("php-gettext/gettext.inc"); } @@ -283,6 +298,7 @@ function get_all_languages() { 'en' => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'), 'es' => array('q' => 1, 'lang' => 'es', 'name' => 'Spanish', 'direction' => 'ltr'), 'fi' => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'), + 'fa' => array('q' => 1, 'lang' => 'fa', 'name' => 'Persian', 'direction' => 'rtl'), 'fr-fr' => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'), 'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'), 'he' => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'), diff --git a/lib/mail.php b/lib/mail.php index dffac3262..472a88e06 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -599,6 +599,10 @@ function mail_notify_attn($user, $notice) $sender = $notice->getProfile(); + if ($sender->id == $user->id) { + return; + } + if (!$sender->hasRight(Right::EMAILONREPLY)) { return; } diff --git a/lib/repeatform.php b/lib/repeatform.php index 50e5d6dbe..4f1c8aa32 100644 --- a/lib/repeatform.php +++ b/lib/repeatform.php @@ -104,7 +104,7 @@ class RepeatForm extends Form */ function formLegend() { - $this->out->element('legend', null, _('Repeat this notice')); + $this->out->element('legend', null, _('Repeat this notice?')); } /** @@ -129,7 +129,7 @@ class RepeatForm extends Form function formActions() { $this->out->submit('repeat-submit-' . $this->notice->id, - _('Repeat'), 'submit', null, _('Repeat this notice')); + _('Yes'), 'submit', null, _('Repeat this notice')); } /** |