From 02299d5bd7c20fdba90daa912119d0f02bedb754 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:06:21 +0200 Subject: * i18n/L10n updates. * add FIXMEs for bad i18n. * add translator hints. --- plugins/Facebook/FBConnectSettings.php | 5 ++++- plugins/Facebook/facebookaction.php | 6 +++--- plugins/TwitterBridge/twitter.php | 8 ++------ plugins/TwitterBridge/twittersettings.php | 3 ++- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/Facebook/FBConnectSettings.php b/plugins/Facebook/FBConnectSettings.php index 590dffd8a..7599bc826 100644 --- a/plugins/Facebook/FBConnectSettings.php +++ b/plugins/Facebook/FBConnectSettings.php @@ -121,12 +121,15 @@ class FBConnectSettingsAction extends ConnectSettingsAction if (!$user->password) { $this->elementStart('p', array('class' => 'form_guide')); + // @todo FIXME: Bad i18n. Patchwork message in three parts. + // TRANS: Followed by a link containing text "set a password". $this->text(_m('Disconnecting your Faceboook ' . 'would make it impossible to log in! Please ')); $this->element('a', array('href' => common_local_url('passwordsettings')), + // TRANS: Preceded by "Please " and followed by " first." _m('set a password')); - + // TRANS: Preceded by "Please set a password". $this->text(_m(' first.')); $this->elementEnd('p'); } else { diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index f65b97c86..467c6af84 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -219,22 +219,22 @@ class FacebookAction extends Action function showInstructions() { - $this->elementStart('div', array('class' => 'facebook_guide')); $this->elementStart('dl', array('class' => 'system_notice')); $this->element('dt', null, 'Page Notice'); $loginmsg_part1 = _m('To use the %s Facebook Application you need to login ' . - 'with your username and password. Don\'t have a username yet? '); + 'with your username and password. Don\'t have a username yet?'); $loginmsg_part2 = _m(' a new account.'); $this->elementStart('dd'); $this->elementStart('p'); $this->text(sprintf($loginmsg_part1, common_config('site', 'name'))); + // @todo FIXME: Bad i18n. Patchwork message in two parts. $this->element('a', array('href' => common_local_url('register')), _m('Register')); - $this->text($loginmsg_part2); + $this->text( " " . $loginmsg_part2); $this->elementEnd('p'); $this->elementEnd('dd'); diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 3bff0af72..d984698ee 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -30,7 +30,6 @@ function add_twitter_user($twitter_id, $screen_name) // Clear out any bad old foreign_users with the new user's legit URL // This can happen when users move around or fakester accounts get // repoed, and things like that. - $luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); if (!empty($luser)) { @@ -135,7 +134,6 @@ function broadcast_twitter($notice) TWITTER_SERVICE); // Don't bother with basic auth, since it's no longer allowed - if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) { if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) { $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of)); @@ -224,7 +222,6 @@ function broadcast_oauth($notice, $flink) { // This could represent a failure posting, // or the Twitter API might just be behaving flakey. - $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . 'trying to post notice %d for User %s (user id %d).', $notice->id, @@ -347,7 +344,6 @@ function remove_twitter_link($flink) * * @return boolean success flag */ - function mail_twitter_bridge_removed($user) { $profile = $user->getProfile(); @@ -360,8 +356,8 @@ function mail_twitter_bridge_removed($user) $body = sprintf(_m('Hi, %1$s. We\'re sorry to inform you that your ' . 'link to Twitter has been disabled. We no longer seem to have ' . - 'permission to update your Twitter status. (Did you revoke ' . - '%3$s\'s access?)' . "\n\n" . + 'permission to update your Twitter status. Did you maybe revoke ' . + '%3$s\'s access?' . "\n\n" . 'You can re-enable your Twitter bridge by visiting your ' . "Twitter settings page:\n\n\t%2\$s\n\n" . "Regards,\n%3\$s\n"), diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index 6b087353a..dab8ab34f 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -128,6 +128,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (!$user->password) { $this->elementStart('p', array('class' => 'form_guide')); + // @todo FIXME: Bad i18n (patchwork in three parts). $this->text(_m('Disconnecting your Twitter ' . 'could make it impossible to log in! Please ')); $this->element('a', @@ -180,7 +181,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (common_config('twitterimport','enabled')) { $this->elementStart('li'); $this->checkbox('noticerecv', - _m('Import my Friends Timeline.'), + _m('Import my friends timeline.'), ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_RECV) : false); -- cgit v1.2.3-54-g00ecf