From 3d52313817c11da6a4e45c036de677d73c5bcd9b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 28 Jan 2018 13:51:45 +0100 Subject: [PATCH 01/32] Remove GooglePlus counter from backend.json --- demo/backend.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/backend.json b/demo/backend.json index 0d72aa18..4794b4e6 100644 --- a/demo/backend.json +++ b/demo/backend.json @@ -1 +1 @@ -{"facebook":0,"googleplus":3387,"linkedin":92,"reddit":12,"stumbleupon":4325,"xing":185} +{"facebook":0,"linkedin":92,"reddit":12,"stumbleupon":4325,"xing":185} From 5a201212aa52d2a9518957fe0009b413e2cfed6c Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 28 Jan 2018 13:59:02 +0100 Subject: [PATCH 02/32] Remove GooglePlus counts also from docs --- README-de.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-de.md b/README-de.md index 88ef31f2..d800e4e6 100644 --- a/README-de.md +++ b/README-de.md @@ -8,7 +8,7 @@ Der Code der offiziellen Buttons von Facebook, Google+ und Twitter überträgt v Shariff `(/ˈʃɛɹɪf/)` ist ein Open-Source Projekt von c't und heise online. -Shariff besteht aus zwei Teilen. Der erste Teil ist eine einfache JavaScript-Bibliothek einschließlich Vektor-Icons und CSS zur Formatierung der Knöpfe. Der zweite ist die optionale, server-seitige Komponente (derzeit für PHP, Perl oder NodeJS). Mit dem Shariff-Backend auf dem eigenen Server muss der Browser des Besuchers zur Darstellung der Share-Counts keine Verbindung zu Facebook oder Google+ aufbauen. Daten werden erst dann zum Social-Media-Netzwerk übertragen, wenn der Besucher den Inhalt tatsächlich teilen möchte. +Shariff besteht aus zwei Teilen. Der erste Teil ist eine einfache JavaScript-Bibliothek einschließlich Vektor-Icons und CSS zur Formatierung der Knöpfe. Der zweite ist die optionale, server-seitige Komponente (derzeit für PHP, Perl oder NodeJS). Mit dem Shariff-Backend auf dem eigenen Server muss der Browser des Besuchers zur Darstellung der Share-Counts keine Verbindung zu den Social-Media-Netzwerken aufbauen. Daten werden erst dann übertragen, wenn der Besucher den Inhalt tatsächlich teilen möchte. ## Erste Schritte diff --git a/README.md b/README.md index 5b5beaf0..da6e5701 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Facebook, Google+ and Twitter supply official sharing code snippets which quietl Shariff `(/ˈʃɛɹɪf/)` is an open-source, low-maintenance, high-privacy solution maintained by German computer magazine c't and heise online. -Shariff consists of two parts: a simple JavaScript client library and an optional server-side component. The latter fetches the number of likes and plus-ones. Share buttons and share counts work without a connection between your visitors' browsers and *social networks* (unless they decide to share, of course). +Shariff consists of two parts: a simple JavaScript client library and an optional server-side component. The latter fetches the number of likes or shares. Share buttons and share counts work without a connection between your visitors' browsers and *social networks* (unless they decide to share, of course). ## Getting Started From c010090e9ea29c3b0facea80f929c7f1b9154523 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 28 Jan 2018 14:09:46 +0100 Subject: [PATCH 03/32] Demo: Update fb counter, add vk --- demo/backend.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/backend.json b/demo/backend.json index 4794b4e6..93923c39 100644 --- a/demo/backend.json +++ b/demo/backend.json @@ -1 +1 @@ -{"facebook":0,"linkedin":92,"reddit":12,"stumbleupon":4325,"xing":185} +{"facebook":906,"linkedin":92,"reddit":12,"stumbleupon":4325,"vk":57,"xing":185} From 00b0fe85f106c470e0088fd111d71b8e4c60135a Mon Sep 17 00:00:00 2001 From: Martin Horniak Date: Wed, 31 Jan 2018 11:05:33 +0100 Subject: [PATCH 04/32] Added czech translations. --- src/js/services/addthis.js | 2 ++ src/js/services/diaspora.js | 2 ++ src/js/services/facebook.js | 2 ++ src/js/services/googleplus.js | 2 ++ src/js/services/info.js | 1 + src/js/services/linkedin.js | 2 ++ src/js/services/mail.js | 1 + src/js/services/pinterest.js | 1 + src/js/services/print.js | 2 ++ src/js/services/qzone.js | 2 ++ src/js/services/reddit.js | 2 ++ src/js/services/stumbleupon.js | 2 ++ src/js/services/telegram.js | 2 ++ src/js/services/tencent-weibo.js | 2 ++ src/js/services/threema.js | 2 ++ src/js/services/tumblr.js | 2 ++ src/js/services/twitter.js | 2 ++ src/js/services/vk.js | 2 ++ src/js/services/weibo.js | 2 ++ src/js/services/whatsapp.js | 2 ++ src/js/services/xing.js | 2 ++ 21 files changed, 39 insertions(+) diff --git a/src/js/services/addthis.js b/src/js/services/addthis.js index e974be2a..ed3a149f 100644 --- a/src/js/services/addthis.js +++ b/src/js/services/addthis.js @@ -6,6 +6,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -34,6 +35,7 @@ module.exports = function(shariff) { faName: 'fa-plus', title: { 'bg': 'Сподели в AddThis', + 'cs': 'Sdílet na AddThis', 'da': 'Del på AddThis', 'de': 'Bei AddThis teilen', 'en': 'Share on AddThis', diff --git a/src/js/services/diaspora.js b/src/js/services/diaspora.js index 52bf254e..89e6274f 100644 --- a/src/js/services/diaspora.js +++ b/src/js/services/diaspora.js @@ -13,6 +13,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'de': 'teilen', + 'cs': 'sdílet', 'en': 'share', 'zh': '分享' }, @@ -20,6 +21,7 @@ module.exports = function(shariff) { faName: 'fa-asterisk', title: { 'de': 'Bei Diaspora teilen', + 'cs': 'Sdílet na Diaspora', 'en': 'Share on Diaspora', 'zh': '分享至Diaspora' }, diff --git a/src/js/services/facebook.js b/src/js/services/facebook.js index c90d2fdb..5809bf61 100644 --- a/src/js/services/facebook.js +++ b/src/js/services/facebook.js @@ -6,6 +6,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -34,6 +35,7 @@ module.exports = function(shariff) { faName: 'fa-facebook', title: { 'bg': 'Сподели във Facebook', + 'cs': 'Sdílet na Facebooku', 'da': 'Del på Facebook', 'de': 'Bei Facebook teilen', 'en': 'Share on Facebook', diff --git a/src/js/services/googleplus.js b/src/js/services/googleplus.js index ddbcd34f..1eb876f1 100644 --- a/src/js/services/googleplus.js +++ b/src/js/services/googleplus.js @@ -6,6 +6,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -34,6 +35,7 @@ module.exports = function(shariff) { faName: 'fa-google-plus', title: { 'bg': 'Сподели в Google+', + 'cs': 'Sdílet na Google+', 'da': 'Del på Google+', 'de': 'Bei Google+ teilen', 'en': 'Share on Google+', diff --git a/src/js/services/info.js b/src/js/services/info.js index 16e91b79..e2a71515 100644 --- a/src/js/services/info.js +++ b/src/js/services/info.js @@ -9,6 +9,7 @@ module.exports = function(shariff) { faName: 'fa-info', title: { 'bg': 'Повече информация', + 'cs': 'Více informací', 'da': 'Flere oplysninger', 'de': 'Weitere Informationen', 'en': 'More information', diff --git a/src/js/services/linkedin.js b/src/js/services/linkedin.js index b4ddd0da..3bd07623 100644 --- a/src/js/services/linkedin.js +++ b/src/js/services/linkedin.js @@ -8,6 +8,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'de': 'mitteilen', + 'cs': 'sdílet', 'en': 'share', 'es': 'compartir', 'fi': 'Jaa', @@ -34,6 +35,7 @@ module.exports = function(shariff) { faName: 'fa-linkedin', title: { 'bg': 'Сподели в LinkedIn', + 'cs': 'Sdílet na LinkedIn', 'da': 'Del på LinkedIn', 'de': 'Bei LinkedIn teilen', 'en': 'Share on LinkedIn', diff --git a/src/js/services/mail.js b/src/js/services/mail.js index 211b0d85..b4616f5c 100644 --- a/src/js/services/mail.js +++ b/src/js/services/mail.js @@ -20,6 +20,7 @@ module.exports = function(shariff) { faName: 'fa-envelope', title: { 'bg': 'Изпрати по имейл', + 'cs': 'Poslat mailem', 'da': 'Sende via e-mail', 'de': 'Per E-Mail versenden', 'en': 'Send by email', diff --git a/src/js/services/pinterest.js b/src/js/services/pinterest.js index 75ef82f6..cfc87709 100644 --- a/src/js/services/pinterest.js +++ b/src/js/services/pinterest.js @@ -25,6 +25,7 @@ module.exports = function(shariff) { name: 'pinterest', faName: 'fa-pinterest-p', title: { + 'cs': 'Přidat na Pinterest', 'de': 'Bei Pinterest pinnen', 'en': 'Pin it on Pinterest', 'es': 'Compartir en Pinterest', diff --git a/src/js/services/print.js b/src/js/services/print.js index a8d0e718..eb1b0111 100755 --- a/src/js/services/print.js +++ b/src/js/services/print.js @@ -10,6 +10,7 @@ module.exports = function(shariff) { popup: false, shareText: { 'bg': '', + 'cs': 'tlačit', 'da': '', 'de': 'drucken', 'en': 'print', @@ -36,6 +37,7 @@ module.exports = function(shariff) { }, title: { 'bg': '', + 'cs': 'tlačit', 'da': '', 'de': 'drucken', 'en': 'print', diff --git a/src/js/services/qzone.js b/src/js/services/qzone.js index b6d1e0fb..28987bef 100644 --- a/src/js/services/qzone.js +++ b/src/js/services/qzone.js @@ -9,6 +9,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -36,6 +37,7 @@ module.exports = function(shariff) { name: 'qzone', faName: 'fa-qq', title: { + 'cs': 'Sdílet na Qzone', 'de': 'Bei Qzone teilen', 'en': 'Share on Qzone', 'zh': '分享至QQ空间' diff --git a/src/js/services/reddit.js b/src/js/services/reddit.js index 7562cc1c..463c51c8 100644 --- a/src/js/services/reddit.js +++ b/src/js/services/reddit.js @@ -11,6 +11,7 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'cs': 'sdílet', 'de': 'teilen', 'en': 'share', 'zh': '分享', @@ -18,6 +19,7 @@ module.exports = function(shariff) { name: 'reddit', faName: 'fa-reddit', title: { + 'cs': 'Sdílet na Redditu', 'de': 'Bei Reddit teilen', 'en': 'Share on Reddit', 'zh': '分享至Reddit' diff --git a/src/js/services/stumbleupon.js b/src/js/services/stumbleupon.js index a0668e25..9d6aba47 100644 --- a/src/js/services/stumbleupon.js +++ b/src/js/services/stumbleupon.js @@ -11,6 +11,7 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'cs': 'sdílet', 'de': 'teilen', 'en': 'share', 'zh': '分享' @@ -18,6 +19,7 @@ module.exports = function(shariff) { name: 'stumbleupon', faName: 'fa-stumbleupon', title: { + 'cs': 'Sdílet na Stumbleuponu', 'de': 'Bei Stumbleupon teilen', 'en': 'Share on Stumbleupon', 'zh': '分享至Stumbleupon' diff --git a/src/js/services/telegram.js b/src/js/services/telegram.js index 78532668..c0ea0f99 100644 --- a/src/js/services/telegram.js +++ b/src/js/services/telegram.js @@ -7,6 +7,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -35,6 +36,7 @@ module.exports = function(shariff) { faName: 'fa-telegram', title: { 'bg': 'Сподели в Telegram', + 'cs': 'Sdílet na Telegramu', 'da': 'Del på Telegram', 'de': 'Bei Telegram teilen', 'en': 'Share on Telegram', diff --git a/src/js/services/tencent-weibo.js b/src/js/services/tencent-weibo.js index 497da337..7a811da6 100644 --- a/src/js/services/tencent-weibo.js +++ b/src/js/services/tencent-weibo.js @@ -9,6 +9,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -36,6 +37,7 @@ module.exports = function(shariff) { name: 'tencent-weibo', faName: 'fa-tencent-weibo', title: { + 'cs': 'Sdílet na tencent weibo', 'de': 'Bei tencent weibo teilen', 'en': 'Share on tencent weibo', 'zh': '分享至腾讯微博' diff --git a/src/js/services/threema.js b/src/js/services/threema.js index b5a07886..9373a58a 100644 --- a/src/js/services/threema.js +++ b/src/js/services/threema.js @@ -9,6 +9,7 @@ module.exports = function(shariff) { popup: false, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -37,6 +38,7 @@ module.exports = function(shariff) { faName: 'fa-lock', title: { 'bg': 'Сподели в Threema', + 'cs': 'Sdílet na Threema', 'da': 'Del på Threema', 'de': 'Bei Threema teilen', 'en': 'Share on Threema', diff --git a/src/js/services/tumblr.js b/src/js/services/tumblr.js index 63e65863..c1307986 100644 --- a/src/js/services/tumblr.js +++ b/src/js/services/tumblr.js @@ -7,6 +7,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -35,6 +36,7 @@ module.exports = function(shariff) { faName: 'fa-tumblr', title: { 'bg': 'Сподели в tumblr', + 'cs': 'Sdílet na tumblru', 'da': 'Del på tumblr', 'de': 'Bei tumblr teilen', 'en': 'Share on tumblr', diff --git a/src/js/services/twitter.js b/src/js/services/twitter.js index 6dc22353..e0afa613 100644 --- a/src/js/services/twitter.js +++ b/src/js/services/twitter.js @@ -33,6 +33,7 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'cs': 'sdílet', 'en': 'tweet', 'zh': '分享' }, @@ -40,6 +41,7 @@ module.exports = function(shariff) { faName: 'fa-twitter', title: { 'bg': 'Сподели в Twitter', + 'cs': 'Sdílet na Twiiteru', 'da': 'Del på Twitter', 'de': 'Bei Twitter teilen', 'en': 'Share on Twitter', diff --git a/src/js/services/vk.js b/src/js/services/vk.js index da14a05d..b16bb07f 100644 --- a/src/js/services/vk.js +++ b/src/js/services/vk.js @@ -6,6 +6,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -34,6 +35,7 @@ module.exports = function(shariff) { faName: 'fa-vk', title: { 'bg': 'Сподели във VK', + 'cs': 'Sdílet na VKu', 'da': 'Del på VK', 'de': 'Bei VK teilen', 'en': 'Share on VK', diff --git a/src/js/services/weibo.js b/src/js/services/weibo.js index a5effe26..d184c3ba 100644 --- a/src/js/services/weibo.js +++ b/src/js/services/weibo.js @@ -9,6 +9,7 @@ module.exports = function(shariff) { popup: true, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -36,6 +37,7 @@ module.exports = function(shariff) { name: 'weibo', faName: 'fa-weibo', title: { + 'cs': 'Sdílet na weibo', 'de': 'Bei weibo teilen', 'en': 'Share on weibo', 'zh': '分享至新浪微博' diff --git a/src/js/services/whatsapp.js b/src/js/services/whatsapp.js index b5093f84..30128849 100644 --- a/src/js/services/whatsapp.js +++ b/src/js/services/whatsapp.js @@ -9,6 +9,7 @@ module.exports = function(shariff) { popup: false, shareText: { 'bg': 'cподеляне', + 'cs': 'sdílet', 'da': 'del', 'de': 'teilen', 'en': 'share', @@ -37,6 +38,7 @@ module.exports = function(shariff) { faName: 'fa-whatsapp', title: { 'bg': 'Сподели в Whatsapp', + 'cs': 'Sdílet na Whatsappu', 'da': 'Del på Whatsapp', 'de': 'Bei Whatsapp teilen', 'en': 'Share on Whatsapp', diff --git a/src/js/services/xing.js b/src/js/services/xing.js index 842901dc..f9645f5f 100644 --- a/src/js/services/xing.js +++ b/src/js/services/xing.js @@ -5,6 +5,7 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'cs': 'sdílet', 'de': 'teilen', 'en': 'share', 'es': 'compartir', @@ -17,6 +18,7 @@ module.exports = function(shariff) { name: 'xing', faName: 'fa-xing', title: { + 'cs': 'Sdílet na XINGu', 'de': 'Bei XING teilen', 'en': 'Share on XING', 'es': 'Compartir en XING', From 35d5fb6a6e77336edea6247309f1a07ecad5d3da Mon Sep 17 00:00:00 2001 From: Martin Horniak Date: Wed, 31 Jan 2018 13:40:48 +0100 Subject: [PATCH 05/32] Added cs-language into data-lang attribute available localisations. --- README-de.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-de.md b/README-de.md index d800e4e6..934067d6 100644 --- a/README-de.md +++ b/README-de.md @@ -89,7 +89,7 @@ $ npm run dev | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | | `data-info-url` | URL der Infoseite. | `http://ct.de/-2467514` | | `data-info-display` | Wie die Infoseite angezeigt wird. Werte: `blank`, `popup`, `self`. | `blank` | -| `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | +| `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `cs`,`de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | | `data-mail-url` | Der Link des `mail`-Buttons | `?view=mail` | diff --git a/README.md b/README.md index da6e5701..ccc91425 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ $ npm run dev | `data-flattr-user` | User that receives Flattr donation. | `null` | | `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | | `data-info-display` | How to display the info page. Values: `blank`, `popup`, `self`. | `blank` | -| `data-lang` | The localisation to use. Available: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | +| `data-lang` | The localisation to use. Available: `bg`, `cs`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail body. The body text should contain the placeholder `{url}` which will be replaced with the share URL. | see `data-url` | | `data-mail-subject` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail subject. | see `data-title` | | `data-mail-url` | The url target used for the `mail` service button | `?view=mail` | From 64326896f8ebfa7273f888e62aea13b9f6ad332e Mon Sep 17 00:00:00 2001 From: Martin Horniak Date: Wed, 31 Jan 2018 13:40:48 +0100 Subject: [PATCH 06/32] Added cs-language into data-lang attribute available localisations. --- README-de.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-de.md b/README-de.md index d800e4e6..934067d6 100644 --- a/README-de.md +++ b/README-de.md @@ -89,7 +89,7 @@ $ npm run dev | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | | `data-info-url` | URL der Infoseite. | `http://ct.de/-2467514` | | `data-info-display` | Wie die Infoseite angezeigt wird. Werte: `blank`, `popup`, `self`. | `blank` | -| `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | +| `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `cs`,`de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | | `data-mail-url` | Der Link des `mail`-Buttons | `?view=mail` | diff --git a/README.md b/README.md index da6e5701..ccc91425 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ $ npm run dev | `data-flattr-user` | User that receives Flattr donation. | `null` | | `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | | `data-info-display` | How to display the info page. Values: `blank`, `popup`, `self`. | `blank` | -| `data-lang` | The localisation to use. Available: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | +| `data-lang` | The localisation to use. Available: `bg`, `cs`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail body. The body text should contain the placeholder `{url}` which will be replaced with the share URL. | see `data-url` | | `data-mail-subject` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail subject. | see `data-title` | | `data-mail-url` | The url target used for the `mail` service button | `?view=mail` | From 20a63b090c0580429fe38509262acfde6b717e0a Mon Sep 17 00:00:00 2001 From: apl Date: Wed, 7 Feb 2018 08:30:31 +0100 Subject: [PATCH 07/32] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13a71af2..6e9739f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +- Added czech translations. (mat-hew1) + ## v2.1.2, 2018-01-26 - Fixed SEO friendliness by adding `rel="nofollow"` to all button links. (richard67) From 4840a3f6e5ed6bedab1eb54c18fdc6c021ef22d5 Mon Sep 17 00:00:00 2001 From: apl Date: Wed, 7 Feb 2018 08:33:05 +0100 Subject: [PATCH 08/32] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9739f6..0cf26de2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - Added czech translations. (mat-hew1) +- Removed G+ counter from documentation and demo. (richard67) ## v2.1.2, 2018-01-26 From 6a78bfe24528da76ea50d80bb5fe42b618bb9087 Mon Sep 17 00:00:00 2001 From: apl Date: Wed, 7 Feb 2018 08:37:24 +0100 Subject: [PATCH 09/32] improve formatting --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cf26de2..cf36c1b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,7 +69,7 @@ This release contains breaking changes: ## 1.25.2 2017-06-13 -* Restored the jQuery dependency for the min.js version. (liayn) +* Restored the jQuery dependency for the `min.js` version. (liayn) * Added Kirby third party integration. (AndiLeni) * Added support for DOM-ready functions. (glaszig) * Updated dependencies. (liayn) @@ -126,7 +126,7 @@ This release contains breaking changes: * Added Threema service. (medienverbinder) * Added StumbleUpon service. (craiq) * Added Reddit service. (craiq) -* Changed rel=popup to data-rel. +* Changed `rel=popup` to `data-rel`. ## v1.20.0 2015-10-22 @@ -156,7 +156,7 @@ This release contains breaking changes: ## v1.16.0 2015-07-13 * Made license SPDX compatible. -* Updated grunt-connect-proxy dependency. (medienverbinder) +* Updated `grunt-connect-proxy` dependency. (medienverbinder) ## v1.15.0 2015-06-30 @@ -192,11 +192,11 @@ This release contains breaking changes: ## v1.10.0 2015-04-15 * Added xing service. (osahner) -* Fixed mailto links opening in new tabs. +* Fixed `mailto` links opening in new tabs. * Updated node dependencies. ## v1.9.3 2015-04-08 -* Added missing shariff.min.css in release. +* Added missing `shariff.min.css` in release. ## v1.9.2 2015-04-08 * Made sure shariff element does not have any children on initialization. @@ -217,7 +217,7 @@ This release contains breaking changes: * Fixed bug in service popups where popups did not open in IE. (doerler) ## v1.7.3 2015-02-14 -* Fixed shariff-complete.css to use font-awesome CDN. +* Fixed `shariff-complete.css` to use font-awesome CDN. ## v1.7.1 2015-02-05 * Fixed bug twitter via detection. From 96f45f2df2dddec3fac3a9e9a240c60efe698df2 Mon Sep 17 00:00:00 2001 From: apl Date: Wed, 7 Feb 2018 10:45:34 +0100 Subject: [PATCH 10/32] remove node backend from readme --- README-de.md | 1 - README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README-de.md b/README-de.md index c2a5e467..a4c13e2c 100644 --- a/README-de.md +++ b/README-de.md @@ -159,7 +159,6 @@ Die URL dieser Seite kann mit einer Option festgelegt werden. Standardwert: `htt Wenn in den Shariff-Buttons die Share-Counts angezeigt werden sollen, wird eines der folgenden Backends benötigt: -* [shariff-backend-node](http://github.com/heiseonline/shariff-backend-node) * [shariff-backend-perl](http://github.com/heiseonline/shariff-backend-perl) * [shariff-backend-php](http://github.com/heiseonline/shariff-backend-php) diff --git a/README.md b/README.md index ccc91425..879f54c9 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,6 @@ The URL of this page can be set with an option. Default value: `http://ct.de/-24 In order to display share counts with Shariff, you need one of the following backends: -* [shariff-backend-node](http://github.com/heiseonline/shariff-backend-node) * [shariff-backend-perl](http://github.com/heiseonline/shariff-backend-perl) * [shariff-backend-php](http://github.com/heiseonline/shariff-backend-php) From 7a8bc9a7205f3f915d9356888b63a65c4a5eace2 Mon Sep 17 00:00:00 2001 From: apl Date: Wed, 7 Feb 2018 12:20:07 +0100 Subject: [PATCH 11/32] remove perl backend from readme --- README-de.md | 3 +-- README.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README-de.md b/README-de.md index a4c13e2c..f74cf302 100644 --- a/README-de.md +++ b/README-de.md @@ -157,9 +157,8 @@ Die URL dieser Seite kann mit einer Option festgelegt werden. Standardwert: `htt ## Backends -Wenn in den Shariff-Buttons die Share-Counts angezeigt werden sollen, wird eines der folgenden Backends benötigt: +Wenn in den Shariff-Buttons die Share-Counts angezeigt werden sollen, wird das folgende Backend benötigt: -* [shariff-backend-perl](http://github.com/heiseonline/shariff-backend-perl) * [shariff-backend-php](http://github.com/heiseonline/shariff-backend-php) Drittanbieter-Backends: diff --git a/README.md b/README.md index 879f54c9..b9aa9029 100644 --- a/README.md +++ b/README.md @@ -159,12 +159,12 @@ The URL of this page can be set with an option. Default value: `http://ct.de/-24 ## Backends -In order to display share counts with Shariff, you need one of the following backends: +In order to display share counts with Shariff, you need the following backend: -* [shariff-backend-perl](http://github.com/heiseonline/shariff-backend-perl) * [shariff-backend-php](http://github.com/heiseonline/shariff-backend-php) Third-party backends: + * [shariff-backend-java](http://github.com/headissue/shariff-backend-java) Once you have one of these backends up and running, insert its URL into the `data-backend-url` attribute. For example, if the backend runs under `http://example.com/my-shariff-backend/`, the `data-backend-url` should be `/my-shariff-backend/`. The script will handle the rest. From 1826bc1b0729997a6b5536069125c1dc98f3a59f Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 11 Feb 2018 13:28:49 +0100 Subject: [PATCH 12/32] Correct handling of data-mail-subject Handle data-mail-subject as described in readme docs. --- src/js/services/mail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/mail.js b/src/js/services/mail.js index b4616f5c..7e9a92fa 100644 --- a/src/js/services/mail.js +++ b/src/js/services/mail.js @@ -5,7 +5,7 @@ module.exports = function(shariff) { // mailto: link? Add body and subject. if (url.indexOf('mailto:') === 0) { - url += '?subject=' + encodeURIComponent(shariff.getTitle()) + url += '?subject=' + encodeURIComponent(shariff.getOption('mailSubject') || shariff.getTitle()) url += '&body=' + encodeURIComponent(shariff.getOption('mailBody').replace(/\{url\}/i, shariff.getURL())) } From 0767648c4330707d14569edd0f26dd2421dcdd90 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Thu, 15 Feb 2018 19:12:37 +0100 Subject: [PATCH 13/32] Change reddit icon to fa-reddit-alien See issue #292 --- src/js/services/reddit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/reddit.js b/src/js/services/reddit.js index 463c51c8..96ff309e 100644 --- a/src/js/services/reddit.js +++ b/src/js/services/reddit.js @@ -17,7 +17,7 @@ module.exports = function(shariff) { 'zh': '分享', }, name: 'reddit', - faName: 'fa-reddit', + faName: 'fa-reddit-alien', title: { 'cs': 'Sdílet na Redditu', 'de': 'Bei Reddit teilen', From 4dd30f58dce885bc50f5f8aa53f7abbf4f873936 Mon Sep 17 00:00:00 2001 From: apl Date: Fri, 16 Feb 2018 15:00:10 +0100 Subject: [PATCH 14/32] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf36c1b9..a77933e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added czech translations. (mat-hew1) - Removed G+ counter from documentation and demo. (richard67) +- Fixed handling of `data-mail-subject`. (richard67) ## v2.1.2, 2018-01-26 From 5c80eb11193d6608bc8400b5231295da41c266f6 Mon Sep 17 00:00:00 2001 From: apl Date: Fri, 16 Feb 2018 15:03:01 +0100 Subject: [PATCH 15/32] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a77933e4..94a32ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added czech translations. (mat-hew1) - Removed G+ counter from documentation and demo. (richard67) - Fixed handling of `data-mail-subject`. (richard67) +- Improved distinguishability of reddit icon. (richard67) ## v2.1.2, 2018-01-26 From 38992c0fc6079206c47d63853ce9ef4adcac0c47 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 17 Feb 2018 12:55:44 +0100 Subject: [PATCH 16/32] Use global.document.title as default title --- src/js/shariff.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/shariff.js b/src/js/shariff.js index 84d43245..ec8390c2 100644 --- a/src/js/shariff.js +++ b/src/js/shariff.js @@ -47,9 +47,7 @@ const Defaults = { // services to be enabled in the following order services: ['twitter', 'facebook', 'googleplus', 'info'], - title: function() { - return $('head title').text() - }, + title: global.document.title, twitterVia: null, From 5b6d76d6ebab922818a3d09df606b268ef39a6d8 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 12:47:38 +0100 Subject: [PATCH 17/32] linkedin - add shareText translations --- src/js/services/linkedin.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/services/linkedin.js b/src/js/services/linkedin.js index 3bd07623..15496eb6 100644 --- a/src/js/services/linkedin.js +++ b/src/js/services/linkedin.js @@ -7,8 +7,10 @@ module.exports = function(shariff) { return { popup: true, shareText: { - 'de': 'mitteilen', + 'bg': 'cподеляне', 'cs': 'sdílet', + 'da': 'del', + 'de': 'mitteilen', 'en': 'share', 'es': 'compartir', 'fi': 'Jaa', From 1a0bd6a3ca2004fdde351bf2685eeec733fb5a6f Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 12:59:32 +0100 Subject: [PATCH 18/32] diaspora - add translations Add missing translations based on threema --- src/js/services/diaspora.js | 46 +++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/js/services/diaspora.js b/src/js/services/diaspora.js index 89e6274f..46f1dcdc 100644 --- a/src/js/services/diaspora.js +++ b/src/js/services/diaspora.js @@ -12,17 +12,59 @@ module.exports = function(shariff) { return { popup: true, shareText: { - 'de': 'teilen', + 'bg': 'cподеляне', 'cs': 'sdílet', + 'da': 'del', + 'de': 'teilen', 'en': 'share', + 'es': 'compartir', + 'fi': 'Jaa', + 'fr': 'partager', + 'hr': 'podijelite', + 'hu': 'megosztás', + 'it': 'condividi', + 'ja': '共有', + 'ko': '공유하기', + 'nl': 'delen', + 'no': 'del', + 'pl': 'udostępnij', + 'pt': 'compartilhar', + 'ro': 'partajează', + 'ru': 'поделиться', + 'sk': 'zdieľať', + 'sl': 'deli', + 'sr': 'podeli', + 'sv': 'dela', + 'tr': 'paylaş', 'zh': '分享' }, name: 'diaspora', faName: 'fa-asterisk', title: { - 'de': 'Bei Diaspora teilen', + 'bg': 'Сподели в Diaspora', 'cs': 'Sdílet na Diaspora', + 'da': 'Del på Diaspora', + 'de': 'Bei Diaspora teilen', 'en': 'Share on Diaspora', + 'es': 'Compartir en Diaspora', + 'fi': 'Jaa Diasporaissä', + 'fr': 'Partager sur Diaspora', + 'hr': 'Podijelite na Diaspora', + 'hu': 'Megosztás Diaspora', + 'it': 'Condividi su Diaspora', + 'ja': 'Diaspora上で共有', + 'ko': 'Diaspora에서 공유하기', + 'nl': 'Delen op Diaspora', + 'no': 'Del på Diaspora', + 'pl': 'Udostępnij przez Diaspora', + 'pt': 'Compartilhar no Diaspora', + 'ro': 'Partajează pe Diaspora', + 'ru': 'Поделиться на Diaspora', + 'sk': 'Zdieľať na Diaspora', + 'sl': 'Deli na Diaspora', + 'sr': 'Podeli na Diaspora-u', + 'sv': 'Dela på Diaspora', + 'tr': 'Diaspora\'ta paylaş', 'zh': '分享至Diaspora' }, shareUrl: url.format(shareUrl) + shariff.getReferrerTrack() From f0e34a667c2e68823da9591eb88d2e7291ea4520 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:12:20 +0100 Subject: [PATCH 19/32] qzone - add translations Add missing translations based on threema --- src/js/services/qzone.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/js/services/qzone.js b/src/js/services/qzone.js index 28987bef..c287c74f 100644 --- a/src/js/services/qzone.js +++ b/src/js/services/qzone.js @@ -37,9 +37,30 @@ module.exports = function(shariff) { name: 'qzone', faName: 'fa-qq', title: { + 'bg': 'Сподели в Qzone', 'cs': 'Sdílet na Qzone', + 'da': 'Del på Qzone', 'de': 'Bei Qzone teilen', 'en': 'Share on Qzone', + 'es': 'Compartir en Qzone', + 'fi': 'Jaa Qzoneissä', + 'fr': 'Partager sur Qzone', + 'hr': 'Podijelite na Qzone', + 'hu': 'Megosztás Qzone', + 'it': 'Condividi su Qzone', + 'ja': 'Qzone上で共有', + 'ko': 'Qzone에서 공유하기', + 'nl': 'Delen op Qzone', + 'no': 'Del på Qzone', + 'pl': 'Udostępnij przez Qzone', + 'pt': 'Compartilhar no Qzone', + 'ro': 'Partajează pe Qzone', + 'ru': 'Поделиться на Qzone', + 'sk': 'Zdieľať na Qzone', + 'sl': 'Deli na Qzone', + 'sr': 'Podeli na Qzone-u', + 'sv': 'Dela på Qzone', + 'tr': 'Qzone\'ta paylaş', 'zh': '分享至QQ空间' }, shareUrl: 'http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=' + url + '&title=' + title + shariff.getReferrerTrack() From 3eba668b0e675acf70c13b96e424e8b8ca09b2b5 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:15:56 +0100 Subject: [PATCH 20/32] reddit - add translations Add missing translations based on tumblr --- src/js/services/reddit.js | 46 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/js/services/reddit.js b/src/js/services/reddit.js index 96ff309e..56ce1838 100644 --- a/src/js/services/reddit.js +++ b/src/js/services/reddit.js @@ -11,17 +11,59 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'bg': 'cподеляне', 'cs': 'sdílet', + 'da': 'del', 'de': 'teilen', 'en': 'share', - 'zh': '分享', + 'es': 'compartir', + 'fi': 'Jaa', + 'fr': 'partager', + 'hr': 'podijelite', + 'hu': 'megosztás', + 'it': 'condividi', + 'ja': '共有', + 'ko': '공유하기', + 'nl': 'delen', + 'no': 'del', + 'pl': 'udostępnij', + 'pt': 'compartilhar', + 'ro': 'partajează', + 'ru': 'поделиться', + 'sk': 'zdieľať', + 'sl': 'deli', + 'sr': 'podeli', + 'sv': 'dela', + 'tr': 'paylaş', + 'zh': '分享' }, name: 'reddit', - faName: 'fa-reddit-alien', + faName: 'fa-reddit', title: { + 'bg': 'Сподели в Reddit', 'cs': 'Sdílet na Redditu', + 'da': 'Del på Reddit', 'de': 'Bei Reddit teilen', 'en': 'Share on Reddit', + 'es': 'Compartir en Reddit', + 'fi': 'Jaa Redditissä', + 'fr': 'Partager sur Reddit', + 'hr': 'Podijelite na Reddit', + 'hu': 'Megosztás Redditen', + 'it': 'Condividi su Reddit', + 'ja': 'Reddit上で共有', + 'ko': 'Reddit에서 공유하기', + 'nl': 'Delen op Reddit', + 'no': 'Del på Reddit', + 'pl': 'Udostępnij przez Reddit', + 'pt': 'Compartilhar no Reddit', + 'ro': 'Partajează pe Reddit', + 'ru': 'Поделиться на Reddit', + 'sk': 'Zdieľať na Reddit', + 'sl': 'Deli na Reddit', + 'sr': 'Podeli na Reddit-u', + 'sv': 'Dela på Reddit', + 'tr': 'Reddit\'ta paylaş', 'zh': '分享至Reddit' }, shareUrl: 'https://reddit.com/submit?url=' + url + title + shariff.getReferrerTrack() From f89503e7f5dd5af30bc4a82c2802803e51d6f427 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:20:41 +0100 Subject: [PATCH 21/32] stumbleupon - add translations Add missing translations based on tumblr --- src/js/services/stumbleupon.js | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/js/services/stumbleupon.js b/src/js/services/stumbleupon.js index 9d6aba47..8c850149 100644 --- a/src/js/services/stumbleupon.js +++ b/src/js/services/stumbleupon.js @@ -11,17 +11,59 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'bg': 'cподеляне', 'cs': 'sdílet', + 'da': 'del', 'de': 'teilen', 'en': 'share', + 'es': 'compartir', + 'fi': 'Jaa', + 'fr': 'partager', + 'hr': 'podijelite', + 'hu': 'megosztás', + 'it': 'condividi', + 'ja': '共有', + 'ko': '공유하기', + 'nl': 'delen', + 'no': 'del', + 'pl': 'udostępnij', + 'pt': 'compartilhar', + 'ro': 'partajează', + 'ru': 'поделиться', + 'sk': 'zdieľať', + 'sl': 'deli', + 'sr': 'podeli', + 'sv': 'dela', + 'tr': 'paylaş', 'zh': '分享' }, name: 'stumbleupon', faName: 'fa-stumbleupon', title: { + 'bg': 'Сподели в Stumbleupon', 'cs': 'Sdílet na Stumbleuponu', + 'da': 'Del på Stumbleupon', 'de': 'Bei Stumbleupon teilen', 'en': 'Share on Stumbleupon', + 'es': 'Compartir en Stumbleupon', + 'fi': 'Jaa Stumbleuponissä', + 'fr': 'Partager sur Stumbleupon', + 'hr': 'Podijelite na Stumbleupon', + 'hu': 'Megosztás Stumbleupon', + 'it': 'Condividi su Stumbleupon', + 'ja': 'Stumbleupon上で共有', + 'ko': 'Stumbleupon에서 공유하기', + 'nl': 'Delen op Stumbleupon', + 'no': 'Del på Stumbleupon', + 'pl': 'Udostępnij przez Stumbleupon', + 'pt': 'Compartilhar no Stumbleupon', + 'ro': 'Partajează pe Stumbleupon', + 'ru': 'Поделиться на Stumbleupon', + 'sk': 'Zdieľať na Stumbleupon', + 'sl': 'Deli na Stumbleupon', + 'sr': 'Podeli na Stumbleupon-u', + 'sv': 'Dela på Stumbleupon', + 'tr': 'Stumbleupon\'ta paylaş', 'zh': '分享至Stumbleupon' }, shareUrl: 'https://www.stumbleupon.com/submit?url=' + url + title + shariff.getReferrerTrack() From 9ef1d56e4e1c9c832e1c822a1655012cf457d817 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:24:37 +0100 Subject: [PATCH 22/32] tencent-weibo - add translations Add missing translations based on threema --- src/js/services/tencent-weibo.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/js/services/tencent-weibo.js b/src/js/services/tencent-weibo.js index 7a811da6..ba697480 100644 --- a/src/js/services/tencent-weibo.js +++ b/src/js/services/tencent-weibo.js @@ -37,9 +37,30 @@ module.exports = function(shariff) { name: 'tencent-weibo', faName: 'fa-tencent-weibo', title: { + 'bg': 'Сподели в tencent weibo', 'cs': 'Sdílet na tencent weibo', + 'da': 'Del på tencent weibo', 'de': 'Bei tencent weibo teilen', 'en': 'Share on tencent weibo', + 'es': 'Compartir en tencent weibo', + 'fi': 'Jaa tencent weiboissä', + 'fr': 'Partager sur tencent weibo', + 'hr': 'Podijelite na tencent weibo', + 'hu': 'Megosztás tencent weiboen', + 'it': 'Condividi su tencent weibo', + 'ja': 'Tencent weibo上で共有', + 'ko': 'Tencent weibo에서 공유하기', + 'nl': 'Delen op tencent weibo', + 'no': 'Del på tencent weibo', + 'pl': 'Udostępnij przez tencent weibo', + 'pt': 'Compartilhar no tencent weibo', + 'ro': 'Partajează pe tencent weibo', + 'ru': 'Поделиться на tencent weibo', + 'sk': 'Zdieľať na tencent weibo', + 'sl': 'Deli na tencent weibo', + 'sr': 'Podeli na tencent weibo-u', + 'sv': 'Dela på tencent weibo', + 'tr': 'Tencent weibo\'ta paylaş', 'zh': '分享至腾讯微博' }, shareUrl: 'http://v.t.qq.com/share/share.php?url=' + url + '&title=' + title + shariff.getReferrerTrack() From 20d2669a67d00f43c64aa59aa5ec08306db58a6e Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:27:13 +0100 Subject: [PATCH 23/32] weibo - add translations Add missing translations based on threema --- src/js/services/weibo.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/js/services/weibo.js b/src/js/services/weibo.js index d184c3ba..9ea72526 100644 --- a/src/js/services/weibo.js +++ b/src/js/services/weibo.js @@ -37,9 +37,30 @@ module.exports = function(shariff) { name: 'weibo', faName: 'fa-weibo', title: { + 'bg': 'Сподели в weibo', 'cs': 'Sdílet na weibo', + 'da': 'Del på weibo', 'de': 'Bei weibo teilen', 'en': 'Share on weibo', + 'es': 'Compartir en weibo', + 'fi': 'Jaa weiboissä', + 'fr': 'Partager sur weibo', + 'hr': 'Podijelite na weibo', + 'hu': 'Megosztás weiboen', + 'it': 'Condividi su weibo', + 'ja': 'Weibo上で共有', + 'ko': 'Weibo에서 공유하기', + 'nl': 'Delen op weibo', + 'no': 'Del på weibo', + 'pl': 'Udostępnij przez weibo', + 'pt': 'Compartilhar no weibo', + 'ro': 'Partajează pe weibo', + 'ru': 'Поделиться на weibo', + 'sk': 'Zdieľať na weibo', + 'sl': 'Deli na weibo', + 'sr': 'Podeli na weibo-u', + 'sv': 'Dela på weibo', + 'tr': 'Weibo\'ta paylaş', 'zh': '分享至新浪微博' }, shareUrl: 'http://service.weibo.com/share/share.php?url=' + url + '&title=' + title + shariff.getReferrerTrack() From e5b7a2c0b8a3f8f54c7810855283e9cfb05fd1f4 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:32:46 +0100 Subject: [PATCH 24/32] xing - add translations Add missing translations based on tumblr --- src/js/services/xing.js | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/js/services/xing.js b/src/js/services/xing.js index f9645f5f..a358ec49 100644 --- a/src/js/services/xing.js +++ b/src/js/services/xing.js @@ -5,27 +5,59 @@ module.exports = function(shariff) { return { popup: true, shareText: { + 'bg': 'cподеляне', 'cs': 'sdílet', + 'da': 'del', 'de': 'teilen', 'en': 'share', 'es': 'compartir', + 'fi': 'Jaa', 'fr': 'partager', + 'hr': 'podijelite', + 'hu': 'megosztás', 'it': 'condividi', - 'da': 'del', + 'ja': '共有', + 'ko': '공유하기', 'nl': 'delen', + 'no': 'del', + 'pl': 'udostępnij', + 'pt': 'compartilhar', + 'ro': 'partajează', + 'ru': 'поделиться', + 'sk': 'zdieľať', + 'sl': 'deli', + 'sr': 'podeli', + 'sv': 'dela', + 'tr': 'paylaş', 'zh': '分享' }, name: 'xing', faName: 'fa-xing', title: { + 'bg': 'Сподели в XING', 'cs': 'Sdílet na XINGu', + 'da': 'Del på XING', 'de': 'Bei XING teilen', 'en': 'Share on XING', 'es': 'Compartir en XING', + 'fi': 'Jaa XINGissä', 'fr': 'Partager sur XING', + 'hr': 'Podijelite na XING', + 'hu': 'Megosztás XINGen', 'it': 'Condividi su XING', - 'da': 'Del på XING', + 'ja': 'XING上で共有', + 'ko': 'XING에서 공유하기', 'nl': 'Delen op XING', + 'no': 'Del på XING', + 'pl': 'Udostępnij przez XING', + 'pt': 'Compartilhar no XING', + 'ro': 'Partajează pe XING', + 'ru': 'Поделиться на XING', + 'sk': 'Zdieľať na XING', + 'sl': 'Deli na XING', + 'sr': 'Podeli na XING-u', + 'sv': 'Dela på XING', + 'tr': 'XING\'ta paylaş', 'zh': '分享至XING' }, shareUrl: 'https://www.xing.com/social_plugins/share?url=' + url + shariff.getReferrerTrack() From 0e1db75382d8c573bb1a6642587d1c791410e165 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 13:49:52 +0100 Subject: [PATCH 25/32] twitter - correct and add translations Correct zh translation from "share" to "tweet" (translated), remove cs translation, add ja, ko, ru, sr so all languages show "tweet" (translated). --- src/js/services/twitter.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/js/services/twitter.js b/src/js/services/twitter.js index e0afa613..5ec3f746 100644 --- a/src/js/services/twitter.js +++ b/src/js/services/twitter.js @@ -33,9 +33,12 @@ module.exports = function(shariff) { return { popup: true, shareText: { - 'cs': 'sdílet', 'en': 'tweet', - 'zh': '分享' + 'ja': 'のつぶやき', + 'ko': '짹짹', + 'ru': 'твит', + 'sr': 'твеет', + 'zh': '鸣叫' }, name: 'twitter', faName: 'fa-twitter', From 6d47c08001fbedfa2949ace9a65a5d779a81d65a Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 14:09:22 +0100 Subject: [PATCH 26/32] pinterest - add translations Add missing translations based on tumblr --- src/js/services/pinterest.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/js/services/pinterest.js b/src/js/services/pinterest.js index cfc87709..d9b2edb4 100644 --- a/src/js/services/pinterest.js +++ b/src/js/services/pinterest.js @@ -25,14 +25,30 @@ module.exports = function(shariff) { name: 'pinterest', faName: 'fa-pinterest-p', title: { + 'bg': 'Сподели в Pinterest', 'cs': 'Přidat na Pinterest', + 'da': 'Del på Pinterest', 'de': 'Bei Pinterest pinnen', 'en': 'Pin it on Pinterest', 'es': 'Compartir en Pinterest', + 'fi': 'Jaa Pinterestissä', 'fr': 'Partager sur Pinterest', + 'hr': 'Podijelite na Pinterest', + 'hu': 'Megosztás Pinteresten', 'it': 'Condividi su Pinterest', - 'da': 'Del på Pinterest', + 'ja': 'Pinterest上で共有', + 'ko': 'Pinterest에서 공유하기', 'nl': 'Delen op Pinterest', + 'no': 'Del på Pinterest', + 'pl': 'Udostępnij przez Pinterest', + 'pt': 'Compartilhar no Pinterest', + 'ro': 'Partajează pe Pinterest', + 'ru': 'Поделиться на Pinterest', + 'sk': 'Zdieľať na Pinterest', + 'sl': 'Deli na Pinterest', + 'sr': 'Podeli na Pinterest-u', + 'sv': 'Dela på Pinterest', + 'tr': 'Pinterest\'ta paylaş', 'zh': '分享至Pinterest' }, shareUrl: url.format(shareUrl) + shariff.getReferrerTrack() From 75592ea16d21d9b31e1327722241d07f51ff43a7 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 18 Feb 2018 14:48:25 +0100 Subject: [PATCH 27/32] Add missing languages to docs Add `da`, `fr`, `it` and `nl` to the list of available languages in the README docs. --- README-de.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-de.md b/README-de.md index f74cf302..ed986263 100644 --- a/README-de.md +++ b/README-de.md @@ -89,7 +89,7 @@ $ npm run dev | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | | `data-info-url` | URL der Infoseite. | `http://ct.de/-2467514` | | `data-info-display` | Wie die Infoseite angezeigt wird. Werte: `blank`, `popup`, `self`. | `blank` | -| `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `cs`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | +| `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `cs`, `da`, `de`, `en`, `es`, `fi`, `fr`, `hr`, `hu`, `it`, `ja`, `ko`, `nl`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | | `data-mail-url` | Der Link des `mail`-Buttons | `?view=mail` | diff --git a/README.md b/README.md index b9aa9029..b95d5ca5 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ $ npm run dev | `data-flattr-user` | User that receives Flattr donation. | `null` | | `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | | `data-info-display` | How to display the info page. Values: `blank`, `popup`, `self`. | `blank` | -| `data-lang` | The localisation to use. Available: `bg`, `cs`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | +| `data-lang` | The localisation to use. Available: `bg`, `cs`, `da`, `de`, `en`, `es`, `fi`, `fr`, `hr`, `hu`, `it`, `ja`, `ko`, `nl`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail body. The body text should contain the placeholder `{url}` which will be replaced with the share URL. | see `data-url` | | `data-mail-subject` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail subject. | see `data-title` | | `data-mail-url` | The url target used for the `mail` service button | `?view=mail` | From 1e18287c8fc76202424cdda60b37dfc19d3596b5 Mon Sep 17 00:00:00 2001 From: Cedric Ziel Date: Wed, 21 Feb 2018 14:17:28 +0100 Subject: [PATCH 28/32] Correct minor typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b9aa9029..574dc2c3 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ $ npm run dev | Attribute | Description | Default | |------------------|-------------|---------| -| `data-backend-url` | The path to your Shariff backend, see below. Settings the value to `null` disables the backend feature. No counts will occur. | `null` | +| `data-backend-url` | The path to your Shariff backend, see below. Setting the value to `null` disables the backend feature. No counts will occur. | `null` | | `data-flattr-category` | Category to be used for Flattr. | `null` | | `data-flattr-user` | User that receives Flattr donation. | `null` | | `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | From 19a2c953bc3fac8955111ac42029f4bec2e7d677 Mon Sep 17 00:00:00 2001 From: apl Date: Fri, 23 Feb 2018 08:21:01 +0100 Subject: [PATCH 29/32] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a32ae1..7174972c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added czech translations. (mat-hew1) - Removed G+ counter from documentation and demo. (richard67) - Fixed handling of `data-mail-subject`. (richard67) +- Fixed crashes occuring if HTML document is missing a valid `` tag. (richard67) - Improved distinguishability of reddit icon. (richard67) ## v2.1.2, 2018-01-26 From 089fbc11bdf9e1a46e76b628a0d9481150d3e2b0 Mon Sep 17 00:00:00 2001 From: apl <apl@heise.de> Date: Fri, 23 Feb 2018 08:26:17 +0100 Subject: [PATCH 30/32] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7174972c..2c7ead0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixed handling of `data-mail-subject`. (richard67) - Fixed crashes occuring if HTML document is missing a valid `<title>` tag. (richard67) - Improved distinguishability of reddit icon. (richard67) +- Improved translations and translation documentation. (richard67) ## v2.1.2, 2018-01-26 From fd85cf6bc1237c2f24481013c5a3e71fb11870a5 Mon Sep 17 00:00:00 2001 From: apl <apl@heise.de> Date: Fri, 23 Feb 2018 08:28:37 +0100 Subject: [PATCH 31/32] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c7ead0c..5f57db98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Removed G+ counter from documentation and demo. (richard67) - Fixed handling of `data-mail-subject`. (richard67) - Fixed crashes occuring if HTML document is missing a valid `<title>` tag. (richard67) +- Fixed typo in documentation. (cedricziel) - Improved distinguishability of reddit icon. (richard67) - Improved translations and translation documentation. (richard67) From 495a4052808ec7e532844e3b65a1837ec7196738 Mon Sep 17 00:00:00 2001 From: apl <apl@heise.de> Date: Fri, 23 Feb 2018 08:32:16 +0100 Subject: [PATCH 32/32] bump to version 2.1.3 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f57db98..5662cb81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## v2.1.3, 2018-02-23 - Added czech translations. (mat-hew1) - Removed G+ counter from documentation and demo. (richard67) diff --git a/package.json b/package.json index 0f5ed0f6..aae31dd3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "shariff", - "version": "2.1.2", + "version": "2.1.3", "description": "Shariff enables website users to share their favorite content without compromising their privacy.", "main": "src/js/shariff.js", "scripts": {