diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 index 953aed8cb70..b619969ac54 100644 --- a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 +++ b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 @@ -35,17 +35,6 @@ export default { shouldOpenInPopup: true }); - Sharing.addSource({ - id: "google+", - icon: "fab-google-plus-square", - title: I18n.t("share.google+"), - generateUrl: function(link) { - return "https://plus.google.com/share?url=" + encodeURIComponent(link); - }, - shouldOpenInPopup: true, - popupHeight: 600 - }); - Sharing.addSource({ id: "email", icon: "envelope-square", diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index 02374147371..152c6440cd5 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -180,7 +180,6 @@ ar: close: 'أغلق' twitter: 'شارك هذا الرابط علي تويتر' facebook: 'شارك هذا الرابط علي الفيسبوك' - google+: 'شارك هذا الرابط علي جوجل+' email: 'شارك هذا الرابط علي بريد إلكتروني' action_codes: public_topic: "أجعل هذا الموضوع عامًّا %{when}" diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml index e2bd18ab23d..4fd922a87ea 100644 --- a/config/locales/client.bg.yml +++ b/config/locales/client.bg.yml @@ -108,7 +108,6 @@ bg: close: 'затвори' twitter: 'споделете тази връзка в Twitter' facebook: 'споделете тази връзка във Facebook' - google+: 'споделете тази връзка в Google+' email: 'изпратете тази връзка с имейл' action_codes: public_topic: "направи тази тема публична на %{when}" diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 073af3c6f6c..08e63429fa2 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -134,7 +134,6 @@ bs_BA: close: 'zatvori' twitter: 'podijeli link na Twitteru' facebook: 'podijeli link na Facebook-u' - google+: 'podijeli link na Google+' email: 'pošalji ovaj link na email' action_codes: public_topic: "postavio ovu temu kao javno %{when}" diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml index 383e9d8924d..265b37de724 100644 --- a/config/locales/client.ca.yml +++ b/config/locales/client.ca.yml @@ -114,7 +114,6 @@ ca: close: 'tanca' twitter: 'comparteix aquest enllaç a Twitter' facebook: 'comparteix aquest enllaç a Facebook' - google+: 'comparteix aquest enllaç a Google+' email: 'envia aquest enllaç per correu electrònic' action_codes: public_topic: "va fer públic aquest tema %{when}" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index ef8d3185116..58a2dd681d5 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -154,7 +154,6 @@ cs: close: 'zavřít' twitter: 'sdílet odkaz na Twitteru' facebook: 'sdílet odkaz na Facebooku' - google+: 'sdílet odkaz na Google+' email: 'odeslat odkaz emailem' action_codes: public_topic: "Téma zveřejněno %{when}" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index e175842c500..9289eb19938 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -108,7 +108,6 @@ da: close: 'luk' twitter: 'del dette link på Twitter' facebook: 'del dette link på Facebook' - google+: 'del dette link på Google+' email: 'send dette link i en e-mail' action_codes: public_topic: "offentliggjorde dette emne %{when}" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index c015825a9ad..f3f0046ff11 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -114,7 +114,6 @@ de: close: 'Schließen' twitter: 'diesen Link auf Twitter teilen' facebook: 'diesen Link auf Facebook teilen' - google+: 'diesen Link auf Google+ teilen' email: 'diesen Link per E-Mail senden' action_codes: public_topic: "hat das Thema öffentlich gemacht, %{when}" diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index 321f0936767..a0b783de344 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -114,7 +114,6 @@ el: close: 'κλείσιμο' twitter: 'κοινοποίησε τον σύνδεσμο στο Twitter' facebook: 'κοινοποίησε τον σύνδεσμο στο Facebook' - google+: 'κοινοποίησε τον σύνδεσμο στο Google+' email: 'στείλε αυτόν τον σύνδεσμο με email' action_codes: public_topic: "έκανε το νήμα δημόσιο στις %{when}" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 979520d084f..ba301a68dfd 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -140,7 +140,6 @@ en: close: 'close' twitter: 'share this link on Twitter' facebook: 'share this link on Facebook' - google+: 'share this link on Google+' email: 'send this link in an email' action_codes: diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index bfbdd174676..25fff7202dd 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -114,7 +114,6 @@ es: close: 'cerrar' twitter: 'comparte este enlace en Twitter' facebook: 'comparte este enlace en Facebook' - google+: 'comparte este enlace en Google+' email: 'comparte este enlace por email' action_codes: public_topic: "hizo este tema público %{when}" diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index deb744b8ee8..219912e2b11 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -114,7 +114,6 @@ et: close: 'Sulge' twitter: 'Jaga seda viidet Twitteris' facebook: 'jaga seda viidet Facebookis' - google+: 'jaga seda viidet Google-plussis' email: 'Jaga viidet meiliga' action_codes: public_topic: "muutsin selle teema avalikuks %{when}" diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index b323fa47c18..727ad346ed7 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -114,7 +114,6 @@ fa_IR: close: 'بسته' twitter: 'این پیوند را در توییتر به اشتراک بگذارید.' facebook: 'این پیوند را در فیسبوک به اشتراک بگذارید.' - google+: 'این پیوند را در Google+‎ به اشتراک بگذارید.' email: 'این پیوند را با ایمیل بفرستید' action_codes: public_topic: "این موضوع در %{when} عمومی شده" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 3dc3919eb5b..c582650f1de 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -114,7 +114,6 @@ fi: close: 'sulje' twitter: 'jaa tämä linkki Twitterissä' facebook: 'jaa tämä linkki Facebookissa' - google+: 'jaa tämä linkki Google+:ssa' email: 'lähetä tämä linkki sähköpostissa' action_codes: public_topic: "teki ketjusta julkisen %{when}" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index ddbca91a6de..8982b8cf65f 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -114,7 +114,6 @@ fr: close: 'fermer' twitter: 'partager ce lien sur Twitter' facebook: 'partager ce lien sur Facebook' - google+: 'partager ce lien sur Google+' email: 'envoyer ce lien dans un courriel' action_codes: public_topic: "a rendu ce sujet public %{when}" diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index 43f11e81fcc..8fcdb1cf6eb 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -108,7 +108,6 @@ gl: close: 'pechar' twitter: 'compartir esta ligazón no Twitter' facebook: 'compartir esta ligazón no Facebook' - google+: 'compartir esta ligazón no Google+' email: 'enviar esta ligazón nun correo electrónico' action_codes: public_topic: "fixo esta publicación pública no %{when}" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 4b0f915e396..bb327f0024c 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -144,7 +144,6 @@ he: close: 'סגור' twitter: 'שתפו קישור זה בטוויטר' facebook: 'שתפו קישור זה בפייסבוק' - google+: 'שתפו קישור זה בגוגל+' email: 'שליחת קישור בדוא״ל' action_codes: public_topic: "הפכו נושא זה לפומבי %{when}" diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml index 527769264e8..083ba0fde07 100644 --- a/config/locales/client.hu.yml +++ b/config/locales/client.hu.yml @@ -114,7 +114,6 @@ hu: close: 'bezár' twitter: 'a hivatkozás megosztása a Twitteren' facebook: 'a hivatkozás megosztása a Facebookon' - google+: 'a hivatkozás megosztása a Google+ -on' email: 'a hivatkozás elküldése e-mailben' action_codes: public_topic: "publikussá tette ezt a témát ekkor: %{when}" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 3dea5240d1e..51f9fee2c86 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -94,7 +94,6 @@ id: close: 'tutup' twitter: 'share link ini di Twitter' facebook: 'share link ini di Facebook' - google+: 'share link ini di Google+' email: 'kirim link ini melalui email' action_codes: public_topic: "membuat topik ini umum %{when}" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index f9bd160c6af..4c994d8691c 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -114,7 +114,6 @@ it: close: 'chiudi' twitter: 'condividi questo collegamento su Twitter' facebook: 'condividi questo collegamento su Facebook' - google+: 'condividi questo collegamento su Google+' email: 'invia questo collegamento via email' action_codes: public_topic: "ha reso questo argomento pubblico %{when}" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index e2a155afe42..48028539177 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -94,7 +94,6 @@ ja: close: '閉じる' twitter: 'Twitter でこのリンクを共有する' facebook: 'Facebook でこのリンクを共有する' - google+: 'Google+ でこのリンクを共有する' email: 'メールでこのリンクを送る' action_codes: public_topic: "トピックを公開しました: %{when} " diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index e2b474fa86d..392f4aec3e6 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -94,7 +94,6 @@ ko: close: '닫기' twitter: '트위터로 공유' facebook: '페이스북으로 공유' - google+: 'Google+로 공유' email: '이메일로 공유' action_codes: public_topic: "이 글을 %{when} 에 공개" diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml index c6f36339dc6..0c382c5aaf4 100644 --- a/config/locales/client.lt.yml +++ b/config/locales/client.lt.yml @@ -154,7 +154,6 @@ lt: close: 'uždaryti' twitter: 'pasidalinkite šią nuorodą per Twitter' facebook: 'pasidalinkite šią nuorodą per Facebook' - google+: 'pasidalinkite šią nuorodą per Google+' email: 'siųskite šią nuorodą į el. paštą' action_codes: public_topic: "nustatė diskusijas viešom %{when}" diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml index 857b02b887c..eeae19eb463 100644 --- a/config/locales/client.lv.yml +++ b/config/locales/client.lv.yml @@ -126,7 +126,6 @@ lv: close: 'aizvērt' twitter: 'padalīties ar šo saiti Twitter' facebook: 'padalīties ar šo saiti Facebook' - google+: 'padalīties ar šo saiti Google+' email: 'nosūtīt šo saiti e-pastā' action_codes: public_topic: "padarīja tēmu publisku %{when}" diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 596bb9a4b49..bf41a7b83fc 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -114,7 +114,6 @@ nb_NO: close: 'lukk' twitter: 'del denne lenken på Twitter' facebook: 'del denne lenken på Facebook' - google+: 'del denne lenken på Google+' email: 'del denne lenken i en e-post' action_codes: public_topic: "gjorde dette emnet offentlig %{when}" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 4a15c7ffa20..c0d21a23234 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -108,7 +108,6 @@ nl: close: 'sluiten' twitter: 'deze koppeling delen op Twitter' facebook: 'deze koppeling delen op Facebook' - google+: 'deze koppeling delen op Google+' email: 'deze koppeling delen via e-mail' action_codes: public_topic: "heeft dit topic openbaar gemaakt op %{when}" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 308bbfa0400..9969051a2d3 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -154,7 +154,6 @@ pl_PL: close: 'zamknij' twitter: 'udostępnij ten odnośnik na Twitterze' facebook: 'udostępnij ten odnośnik na Facebooku' - google+: 'udostępnij ten odnośnik na Google+' email: 'wyślij ten odnośnik przez email' action_codes: public_topic: "Upublicznij ten temat %{when}" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 28669077bd9..06280c543fa 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -114,7 +114,6 @@ pt: close: 'fechar' twitter: 'partilhar esta hiperligação no Twitter' facebook: 'partilhar esta hiperligação no Facebook' - google+: 'partilhar esta hiperligação no Google+' email: 'enviar esta hiperligação por e-mail' action_codes: public_topic: "tornei este tópico publico %{when}" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index df48ccfcda0..aa43eefdbde 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -114,7 +114,6 @@ pt_BR: close: 'fechar' twitter: 'compartilhe este link no Twitter' facebook: 'compartilhe este link no Facebook' - google+: 'compartilhe este link no Google+' email: 'enviar esse link para um email' action_codes: public_topic: "tornou este tópico público em %{when}" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 455690297ac..f707a23b20f 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -134,7 +134,6 @@ ro: close: 'Închide' twitter: 'Distribuie pe Twitter' facebook: 'Distribuie pe Facebook' - google+: 'Distribuie pe Google+' email: 'Drimite pe email' action_codes: public_topic: "a făcut acest subiect public %{when}" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index e9158a36ac4..6b7bfbf61de 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -154,7 +154,6 @@ ru: close: 'Закрыть' twitter: 'Поделиться ссылкой через Twitter' facebook: 'Поделиться ссылкой через Facebook' - google+: 'Поделиться ссылкой через Google+' email: 'Поделиться ссылкой по электронной почте' action_codes: public_topic: "Сделал эту тему публичной %{when}" diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index 69deaad8e75..94eb5ed5057 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -154,7 +154,6 @@ sk: close: 'zatvoriť' twitter: 'zdieľaj odkaz na Twitteri' facebook: 'zdieľaj odkaz na Facebooku' - google+: 'zdieľaj odkaz na Google+' email: 'pošli odkaz emailom' action_codes: public_topic: "téma je verejná%{when}" diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml index 057908c6e0a..4ebb405d83f 100644 --- a/config/locales/client.sl.yml +++ b/config/locales/client.sl.yml @@ -154,7 +154,6 @@ sl: close: 'zapri' twitter: 'deli povezavo na Twitterju' facebook: 'deli povezao na Facebooku' - google+: 'deli povezavo na Google+' email: 'pošlji povezavo preko e-pošte' action_codes: public_topic: "je naredil temo javno %{when}" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index a98ec436ee8..5a917c8fae4 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -107,7 +107,6 @@ sq: close: 'mbylle' twitter: 'shpërndaje këtë lidhje në Twitter' facebook: 'postojeni këtë lidhje në Facebook' - google+: 'shpërndaje këtë lidhje në Google+' email: 'dërgoje këtë lidhje me email' action_codes: public_topic: "e bëri këtë temë publike %{when}" diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml index 2e9bc71b1e6..f0bcccac5a9 100644 --- a/config/locales/client.sr.yml +++ b/config/locales/client.sr.yml @@ -134,7 +134,6 @@ sr: close: 'zatvori' twitter: 'podeli ovaj link na Twitteru' facebook: 'podeli ovaj link na Facebooku' - google+: 'podeli ovaj link na Google+' email: 'podeli ovaj link preko e-pošte' action_codes: public_topic: "objavi ovu temu javno %{when}" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 44f16880302..b9544c259b3 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -108,7 +108,6 @@ sv: close: 'stäng' twitter: 'dela denna länk på Twitter' facebook: 'dela denna länk på Facebook' - google+: 'dela denna länk på Google+' email: 'skicka denna länk i ett e-postmeddelande' action_codes: public_topic: "gjorde det här ämnet publikt %{when}" diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml index fc303413ff6..81bbc855547 100644 --- a/config/locales/client.sw.yml +++ b/config/locales/client.sw.yml @@ -114,7 +114,6 @@ sw: close: 'funga' twitter: 'Shiriki hiki kiungo kwenye Twitter' facebook: 'Shiriki hiki kiungo kwenye Facebook' - google+: 'Kishiriki hiki kiungo kwenye Google+, mtandao wa kijamii' email: 'tuma kiungo hiki kwenye barua pepe' action_codes: public_topic: "ameifanya hii mada isiwe ya siri %{when}" diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 6af53b23cc8..50c974ac9d3 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -96,7 +96,6 @@ te: close: 'మూసివేయి' twitter: 'ఈ లింక్ ను ట్విట్టరు లో పంచుకొండి' facebook: 'ఈ లింక్ ను ఫేస్ బుక్ లో పంచుకొండి' - google+: 'ఈ లింక్ ను గూగుల్ ప్లస్ లో పంచుకొండి' email: 'ఈ లింక్ ను ఈమెయిల్ లో పంచుకొండి' topic_admin_menu: "విషయపు అధికార చర్యలు" emails_are_disabled: "బయటకు వెళ్లే అన్ని ఈమెయిల్లూ అధికారి నిశేధించాడు. ఇప్పుడు ఎటువంటి ఈమెయిల్ ప్రకటనలూ పంపవీలవదు." diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml index d1b38d8693f..fce6af83648 100644 --- a/config/locales/client.th.yml +++ b/config/locales/client.th.yml @@ -90,7 +90,6 @@ th: close: 'ปิด' twitter: 'แบ่งปันลิงก์นี้บน Twitter' facebook: 'แบ่งปันลิงก์นี้บน Facebook' - google+: 'แบ่งปันลิงก์บน Google+' email: 'ส่งลิงก์นี้ทางอีเมล' action_codes: public_topic: "ทำให้กระทู้นี้เป็นสาธารณะ %{when} " diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 49e9accadc9..1c2ef497cce 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -114,7 +114,6 @@ tr_TR: close: 'kapat' twitter: 'bu bağlantıyı Twitter''da paylaş' facebook: 'bu bağlantıyı Facebook''da paylaş' - google+: 'bu bağlantıyı Google+''da paylaş' email: 'bu bağlantıyı e-posta ile gönder' action_codes: public_topic: "bu konuyu %{when} herkese açık yaptı" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 5d2f2d7e816..76f530664dc 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -67,7 +67,6 @@ uk: close: 'сховати' twitter: 'поширити це посилання в Twitter' facebook: 'поширити це посилання в Facebook' - google+: 'поширити це посилання в Google+' email: 'надіслати це посилання електронною поштою' topic_admin_menu: "керування темою" emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано." diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml index 9271de72f8e..b8e5f2d24d1 100644 --- a/config/locales/client.ur.yml +++ b/config/locales/client.ur.yml @@ -114,7 +114,6 @@ ur: close: 'بند کریں' twitter: 'ٹوئٹر پر اس لنک کو شیئرکریں' facebook: 'فیس بک پر اس لنک کو شیئرکریں' - google+: 'گُوگَل+ پر اس لنک کو شیئرکریں' email: 'اس لنک کو ای میل میں بھیجیں' action_codes: public_topic: "اس ٹاپک کو پبلک بنایا گیا %{when}" diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index ab5aae9259b..5547964199a 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -94,7 +94,6 @@ vi: close: 'đóng' twitter: 'chia sẻ lên Twitter' facebook: 'chia sẻ lên Facebook' - google+: 'chia sẻ lên Google+' email: 'Gửi liên kết này qua email' action_codes: public_topic: "hiển thị chủ đề này công khai lúc %{when}" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 033cf65169f..dfa4a231aa5 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -94,7 +94,6 @@ zh_CN: close: '关闭' twitter: '分享至 Twitter' facebook: '分享至 Facebook' - google+: '分享至 Google+' email: '在电子邮件里发送该链接' action_codes: public_topic: "于%{when}设置为公共主题" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 575d3d3b265..0c7c0178d63 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -94,7 +94,6 @@ zh_TW: close: '關閉' twitter: '在 Twitter 分享此連結' facebook: '在 Facebook 分享此連結' - google+: '在 Google+ 分享此連結' email: '以電子郵件分享此連結' action_codes: public_topic: "於 %{when}發佈這個話題" diff --git a/config/site_settings.yml b/config/site_settings.yml index 546ba41581d..46f838f1cc1 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -212,7 +212,6 @@ basic: choices: - twitter - facebook - - google+ - email desktop_category_page_style: client: true diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js index 3065d01a68c..c620c54804e 100644 --- a/test/javascripts/helpers/site-settings.js +++ b/test/javascripts/helpers/site-settings.js @@ -13,7 +13,7 @@ Discourse.SiteSettingsOriginal = { top_menu: "latest|new|unread|categories|top", post_menu: "like-count|like|share|flag|edit|bookmark|delete|admin|reply", post_menu_hidden_items: "flag|edit|delete|admin", - share_links: "twitter|facebook|google+|email", + share_links: "twitter|facebook|email", category_colors: "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735", enable_mobile_theme: true,