diff options
author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /plugins | |
parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po | 10 | ||||
-rw-r--r-- | plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po | 10 | ||||
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 3 | ||||
-rw-r--r-- | plugins/Realtime/README | 4 | ||||
-rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 27 | ||||
-rw-r--r-- | plugins/Realtime/locale/Realtime.pot | 53 | ||||
-rw-r--r-- | plugins/Realtime/realtimeupdate.css | 2 | ||||
-rw-r--r-- | plugins/Realtime/realtimeupdate.js | 23 | ||||
-rw-r--r-- | plugins/XCache/locale/fi/LC_MESSAGES/XCache.po | 30 |
9 files changed, 136 insertions, 26 deletions
diff --git a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po index cbe5e0554..66ffa6b7a 100644 --- a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po +++ b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po @@ -10,14 +10,14 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - Adsense\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-27 23:43+0000\n" -"PO-Revision-Date: 2010-10-27 23:46:09+0000\n" +"POT-Creation-Date: 2010-10-30 23:18+0000\n" +"PO-Revision-Date: 2010-10-30 23:20:58+0000\n" "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-" "br>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-20 17:58:21+0000\n" -"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-29 16:11:50+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: #out-statusnet-plugin-adsense\n" @@ -80,7 +80,7 @@ msgstr "Código colocado dentro de um retângulo." #: adsenseadminpanel.php:188 msgid "Leaderboard" -msgstr "" +msgstr "Classificação" #: adsenseadminpanel.php:189 msgid "Leaderboard slot code" diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po index 5b60c244d..0680fec71 100644 --- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po +++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - Facebook\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-27 23:43+0000\n" -"PO-Revision-Date: 2010-10-27 23:46:35+0000\n" +"POT-Creation-Date: 2010-10-30 23:18+0000\n" +"PO-Revision-Date: 2010-10-30 23:21:30+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: 2010-10-23 18:57:01+0000\n" -"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-29 16:12:45+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: #out-statusnet-plugin-facebook\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Hallo %1$s.\n" "\n" -"Het spijt ons je te moeten meedelen dat het niet mogelijk is uw " +"Het spijt ons u te moeten meedelen dat het niet mogelijk is uw " "Facebookstatus bij te werken vanuit %2$s. De Facebookapplicatie is " "uitgeschakeld voor uw gebruiker. Dit kan komen doordat u de toegangsrechten " "voor de Facebookapplicatie hebt ingetrokken of omdat u uw Facebookgebruiker " diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 03fcb71df..90bf671eb 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -588,7 +588,8 @@ class Ostatus_profile extends Memcached_DataObject // We mark up the attachment link specially for the HTML output // so we can fold-out the full version inline. - // TRANS: Shown when a notice is longer than supported and/or when attachments are present. + // @fixme I18N this tooltip will be saved with the site's default language + // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime this will usually be replaced with localized text from StatusNet core messages. $showMoreText = _m('Show more'); $attachUrl = common_local_url('attachment', array('attachment' => $attachment->id)); diff --git a/plugins/Realtime/README b/plugins/Realtime/README index 99c79cfab..9b36d87f3 100644 --- a/plugins/Realtime/README +++ b/plugins/Realtime/README @@ -5,6 +5,6 @@ * Pause ~ retain up to 50-100 most recent notices * Add geo data * Make it work for Conversation page (perhaps a little tricky) -* IE is updating the counter in document title all the time (Not sure if this is still an issue) +* IE is updating the counter in document title all the time (Not sure if this + is still an issue) * Reconsider the timestamp approach - diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 352afcf78..99d1ff9c1 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class RealtimePlugin extends Plugin { protected $replyurl = null; @@ -326,6 +325,32 @@ class RealtimePlugin extends Plugin return array('plugins/Realtime/realtimeupdate.js'); } + /** + * Export any i18n messages that need to be loaded at runtime... + * + * @param Action $action + * @param array $messages + * + * @return boolean hook return value + */ + function onEndScriptMessages($action, &$messages) + { + // TRANS: Text label for realtime view "play" button, usually replaced by an icon. + $messages['realtime_play'] = _m('BUTTON', 'Play'); + // TRANS: Tooltip for realtime view "play" button. + $messages['realtime_play_tooltip'] = _m('TOOLTIP', 'Play'); + // TRANS: Text label for realtime view "pause" button + $messages['realtime_pause'] = _m('BUTTON', 'Pause'); + // TRANS: Tooltip for realtime view "pause" button + $messages['realtime_pause_tooltip'] = _m('TOOLTIP', 'Pause'); + // TRANS: Text label for realtime view "popup" button, usually replaced by an icon. + $messages['realtime_popup'] = _m('BUTTON', 'Pop up'); + // TRANS: Tooltip for realtime view "popup" button. + $messages['realtime_popup_tooltip'] = _m('TOOLTIP', 'Pop up in a window'); + + return true; + } + function _updateInitialize($timeline, $user_id) { return "RealtimeUpdate.init($user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->repeaturl\", \"$this->deleteurl\"); "; diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot new file mode 100644 index 000000000..e491ce0c7 --- /dev/null +++ b/plugins/Realtime/locale/Realtime.pot @@ -0,0 +1,53 @@ +# 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: 2010-11-02 19:46+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: Text label for realtime view "play" button, usually replaced by an icon. +#: RealtimePlugin.php:339 +msgctxt "BUTTON" +msgid "Play" +msgstr "" + +#. TRANS: Tooltip for realtime view "play" button. +#: RealtimePlugin.php:341 +msgctxt "TOOLTIP" +msgid "Play" +msgstr "" + +#. TRANS: Text label for realtime view "pause" button +#: RealtimePlugin.php:343 +msgctxt "BUTTON" +msgid "Pause" +msgstr "" + +#. TRANS: Tooltip for realtime view "pause" button +#: RealtimePlugin.php:345 +msgctxt "TOOLTIP" +msgid "Pause" +msgstr "" + +#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon. +#: RealtimePlugin.php:347 +msgctxt "BUTTON" +msgid "Pop up" +msgstr "" + +#. TRANS: Tooltip for realtime view "popup" button. +#: RealtimePlugin.php:349 +msgctxt "TOOLTIP" +msgid "Pop up in a window" +msgstr "" diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css index f43c97de5..b277b30a1 100644 --- a/plugins/Realtime/realtimeupdate.css +++ b/plugins/Realtime/realtimeupdate.css @@ -35,7 +35,6 @@ width:70%; margin-left:1%; } - #notices_primary { position:relative; } @@ -75,4 +74,3 @@ line-height:1.2; #showstream #notices_primary { margin-top: 18px; } - diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 25dc12d58..f49cef95e 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -261,9 +261,10 @@ RealtimeUpdate = { RealtimeUpdate.addNoticesHover(); $('#realtime_playpause').remove(); - $('#realtime_actions').prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause" title="Pause">Pause</button></li>'); - - $('#realtime_pause').bind('click', function() { + $('#realtime_actions').prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>'); + $('#realtime_pause').text(SN.msg('realtime_pause')) + .attr('title', SN.msg('realtime_pause_tooltip')) + .bind('click', function() { RealtimeUpdate.removeNoticesHover(); RealtimeUpdate.showPlay(); return false; @@ -274,9 +275,10 @@ RealtimeUpdate = { { RealtimeUpdate.setPause(true); $('#realtime_playpause').remove(); - $('#realtime_actions').prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play" title="Play">Play</button></li>'); - - $('#realtime_play').bind('click', function() { + $('#realtime_actions').prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>'); + $('#realtime_play').text(SN.msg('realtime_play')) + .attr('title', SN.msg('realtime_play_tooltip')) + .bind('click', function() { RealtimeUpdate.showPause(); return false; }); @@ -334,10 +336,11 @@ RealtimeUpdate = { initAddPopup: function(url, timeline, path) { - $('#realtime_timeline').append('<button id="realtime_popup" title="Pop up in a window">Pop up</button>'); - - $('#realtime_popup').bind('click', function() { - window.open(url, + $('#realtime_timeline').append('<button id="realtime_popup"></button>'); + $('#realtime_popup').text(SN.msg('realtime_popup')) + .attr('title', SN.msg('realtime_popup_tooltip')) + .bind('click', function() { + window.open(url, '', 'toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550'); diff --git a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po new file mode 100644 index 000000000..c0ce345eb --- /dev/null +++ b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po @@ -0,0 +1,30 @@ +# Translation of StatusNet - XCache to Finnish (Suomi) +# Expored from translatewiki.net +# +# Author: Centerlink +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet - XCache\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-10-30 23:18+0000\n" +"PO-Revision-Date: 2010-10-30 23:23:06+0000\n" +"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-POT-Import-Date: 2010-10-29 16:14:46+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: fi\n" +"X-Message-Group: #out-statusnet-plugin-xcache\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: XCachePlugin.php:120 +msgid "" +"Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to " +"cache query results." +msgstr "" +"Käytä <a href=\"http://xcache.lighttpd.net/\">XCache</a>-muuttujavälimuistia " +"kyselyn tulosten tallentamiseksi välimuistiin." |