From 885c5888a6361ab46009f4ef6fbc8dcd280876fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20L=C3=B3pez=20Roca?= Date: Sun, 18 Oct 2015 10:10:54 +0200 Subject: [PATCH 1/5] Spanish translation update --- locale/es.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/es.json b/locale/es.json index b9886a6..f7fee9e 100644 --- a/locale/es.json +++ b/locale/es.json @@ -124,18 +124,18 @@ "clickToDrag":"Click para arrastrar", "keyboardShortcuts":"Atajos de teclado", "classicInterface":"Classic {site-title}", - "accessibilityToggleLink":"For better accessibility, click this link to switch to the classic interface", - "tooltipBookmarkStream":"Add this stream to your bookmarks", - "tooltipTopMenu":"Menu and settings", - "tooltipAttachImage":"Attach an image", - "tooltipShortenUrls":"Shorten all URLs in the Queet", - "tooltipReloadStream":"Refresh this stream", - "tooltipRemoveBookmark":"Remove this bookmark", - "clearHistory":"Clear browsing history", - "ERRORsomethingWentWrong":"Something went wrong.", - "ERRORmustBeLoggedIn":"You must be logged in to view this stream.", - "ERRORcouldNotFindUserWithNickname":"Could not find a user with nickname \"{nickname}\" on this server", - "ERRORcouldNotFindGroupWithNickname":"Could not find a group with nickname \"{nickname}\" on this server", - "ERRORcouldNotFindPage":"Could not find that page.", - "ERRORnoticeRemoved": "This notice has been removed." + "accessibilityToggleLink":" Para una mejor accesibilidad, clica este enlace para cambiar a la vista clásica", + "tooltipBookmarkStream":"Añadir este stream a tus favoritos", + "tooltipTopMenu":"Menú i configuración", + "tooltipAttachImage":"Añade una imagen", + "tooltipShortenUrls":"Acortar todas las URL del Queet", + "tooltipReloadStream":"Actualiza el stream", + "tooltipRemoveBookmark":"Eliminar el marcador", + "clearHistory":"Limpiar el historial de navegación", + "ERRORsomethingWentWrong":"Algo ha ido mal.", + "ERRORmustBeLoggedIn":"Debes iniciar sessión para ver el stream.", + "ERRORcouldNotFindUserWithNickname":"No se ha encontrado el usuario con el apodo \"{nickname}\" en este servidor", + "ERRORcouldNotFindGroupWithNickname":"No se ha encontrado el grupo con el nombre \"{nickname}\" en este servidor", + "ERRORcouldNotFindPage":"No se pudo encontrar la página.", + "ERRORnoticeRemoved": "Este aviso se ha eliminado." } From caa90568b2e5648008a5e6707e94b3a44bb79ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20L=C3=B3pez=20Roca?= Date: Sun, 18 Oct 2015 10:22:34 +0200 Subject: [PATCH 2/5] removed space in the beginning of a line --- locale/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/es.json b/locale/es.json index f7fee9e..0572ff2 100644 --- a/locale/es.json +++ b/locale/es.json @@ -124,7 +124,7 @@ "clickToDrag":"Click para arrastrar", "keyboardShortcuts":"Atajos de teclado", "classicInterface":"Classic {site-title}", - "accessibilityToggleLink":" Para una mejor accesibilidad, clica este enlace para cambiar a la vista clásica", + "accessibilityToggleLink":"Para una mejor accesibilidad, clica este enlace para cambiar a la vista clásica", "tooltipBookmarkStream":"Añadir este stream a tus favoritos", "tooltipTopMenu":"Menú i configuración", "tooltipAttachImage":"Añade una imagen", From 76f579b84abe9f9c7ee06ee704924a6afd3a295d Mon Sep 17 00:00:00 2001 From: Hannes Mannerheim Date: Mon, 19 Oct 2015 18:47:24 +0200 Subject: [PATCH 3/5] possibility for other plugins to add streams and translations to qvitter --- QvitterPlugin.php | 6 +++++- actions/qvitter.php | 2 +- js/qvitter.js | 16 ++++++++++++++++ js/stream-router.js | 22 ++++++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/QvitterPlugin.php b/QvitterPlugin.php index 5ea7b40..d348ab0 100644 --- a/QvitterPlugin.php +++ b/QvitterPlugin.php @@ -212,7 +212,11 @@ class QvitterPlugin extends Plugin { if ($this->hijack_ui === true) { - $m->connect('', array('action' => 'qvitter')); + + // other plugins might want to reroute to qvitter + Event::handle('QvitterHijackUI', array($m)); + + $m->connect('', array('action' => 'qvitter')); $m->connect('main/all', array('action' => 'qvitter')); $m->connect('main/public', array('action' => 'qvitter')); $m->connect('search/notice', array('action' => 'qvitter')); diff --git a/actions/qvitter.php b/actions/qvitter.php index c5b3e07..0c99949 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -494,7 +494,7 @@ class QvitterAction extends ApiAction -
diff --git a/js/qvitter.js b/js/qvitter.js index 3e6f2ea..6223642 100644 --- a/js/qvitter.js +++ b/js/qvitter.js @@ -37,6 +37,9 @@ · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */ +// plugins can add translatons to this object +window.pluginTranslations = []; + // object to keep old states of streams in, to speed up stream change window.oldStreams = new Object(); @@ -723,6 +726,19 @@ $(window).load(function() { function proceedToSetLanguageAndLogin(data){ window.sL = data; + // plugins might have added translations + $.each(window.pluginTranslations,function(k,pluginTranslation) { + if(typeof pluginTranslation[window.selectedLanguage] != 'undefined') { + $.extend(window.sL,pluginTranslation[window.selectedLanguage]); + } + else if(typeof pluginTranslation['en'] != 'undefined') { + $.extend(window.sL,pluginTranslation['en']); + } + }); + + // plugins might want to wait and do stuff until after language is set + $(document).trigger('qvitterAfterLanguageIsSet'); + // if this is a RTL-language, add rtl class to body if(window.sL.directionality == 'rtl') { $('body').addClass('rtl'); diff --git a/js/stream-router.js b/js/stream-router.js index f3913f1..e168173 100644 --- a/js/stream-router.js +++ b/js/stream-router.js @@ -37,6 +37,16 @@ · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */ +/* · + · + · Other plugins can add streams to Qvitter, by pushing streamObjects to + · this array. See the structure in pathToStreamRouter() + · + · · · · · · · · · */ + +window.pluginStreamObjects = []; + + /* · · @@ -347,6 +357,18 @@ function pathToStreamRouter(path) { streamObject.stream = 'statusnet/groups/list.json?count=10&screen_name=' + streamObject.nickname + '&withuserarray=1'; return streamObject; } + + // other plugins can add streams to Qvitter + if(window.pluginStreamObjects.length > 0) { + $.each(window.pluginStreamObjects,function(k,pluginStreamObject) { + if(typeof pluginStreamObject.pathRegExp != 'undefined' && pluginStreamObject.pathRegExp.test(path)){ + $.extend(streamObject,pluginStreamObject); + return false; + } + }); + return streamObject; + } + } From 885ca8b80125362f8233d6af480e61e4184a5851 Mon Sep 17 00:00:00 2001 From: Hannes Mannerheim Date: Mon, 19 Oct 2015 22:17:45 +0200 Subject: [PATCH 4/5] allow other plugins to add hidden html #295 --- actions/qvitter.php | 2 +- css/qvitter.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/actions/qvitter.php b/actions/qvitter.php index 0c99949..e01dcdd 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -523,7 +523,7 @@ class QvitterAction extends ApiAction
- +
diff --git a/css/qvitter.css b/css/qvitter.css index ef1f605..3901d36 100644 --- a/css/qvitter.css +++ b/css/qvitter.css @@ -84,7 +84,8 @@ ul, li { list-style: none outside none; } -#dynamic-styles { +#dynamic-styles, +#hidden-html { display:none; } From d76f4e90bc49e9dee5f97e66d161be03835e4989 Mon Sep 17 00:00:00 2001 From: Hannes Mannerheim Date: Wed, 21 Oct 2015 13:16:45 +0200 Subject: [PATCH 5/5] closes #295 --- actions/qvitter.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/actions/qvitter.php b/actions/qvitter.php index e01dcdd..6b41807 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -523,7 +523,23 @@ class QvitterAction extends ApiAction
-
+
arg('notice')) { + echo '
    '; + $notice = Notice::getKV('id', $this->arg('notice')); + if($notice instanceof Notice) { + $widget = new NoticeListItem($notice, $this); + $widget->show(); + $this->flush(); + } + echo '
'; + } + + Event::handle('QvitterHiddenHtml', array($this)); + + ?>