From f5fc0b6b5579be2cb093acf8979958eb512509e0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 19 Nov 2013 12:42:19 -0500 Subject: [PATCH] Only show external link icons, use the wikipedia-style icon. --- .../discourse/templates/components/topic-map.js.handlebars | 4 ++-- config/locales/client.cs.yml | 3 +-- config/locales/client.da.yml | 2 +- config/locales/client.de.yml | 3 +-- config/locales/client.en.yml | 3 +-- config/locales/client.es.yml | 2 +- config/locales/client.fr.yml | 3 +-- config/locales/client.id.yml | 2 +- config/locales/client.it.yml | 3 +-- config/locales/client.ko.yml | 3 +-- config/locales/client.nb_NO.yml | 3 +-- config/locales/client.nl.yml | 3 +-- config/locales/client.pseudo.yml | 3 +-- config/locales/client.pt.yml | 2 +- config/locales/client.pt_BR.yml | 3 +-- config/locales/client.ru.yml | 3 +-- config/locales/client.sv.yml | 2 +- config/locales/client.zh_CN.yml | 5 ++--- config/locales/client.zh_TW.yml | 3 +-- 19 files changed, 21 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars index cf41fb095eb..7a5a08d0982 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars @@ -29,7 +29,7 @@ {{number topic.views}}
  • -

    {{i18n participants}}

    +

    {{i18n users}}

    {{number topic.participant_count}}
    • {{#if topic.like_count}} @@ -63,7 +63,7 @@ {{clicks}} {{#if title}}{{title}}{{else}}{{shortenUrl url}}{{/if}} - {{#if internal}}{{/if}} + {{#unless internal}}{{/unless}} {{/groupedEach}} diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index c4fe1dcc7a0..d26c609c6c6 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -982,7 +982,6 @@ cs: title: "Souhrn tématu" links_shown: "zobrazit všech {{totalLinks}} odkazů..." clicks: "počet kliknutí" - topic_link: "odkaz na téma" topic_statuses: locked: @@ -1003,7 +1002,7 @@ cs: activity: "Aktivita" likes: "Líbí se" likes_long: "je zde {{number}} 'líbí se' v tomto tématu" - participants: "Účastníci" + users: "Účastníci" category_title: "Kategorie" history: "Historie" changed_by: "od uživatele {{author}}" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 3cd19622f4c..07f7c52bbc0 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -637,7 +637,7 @@ da: views_long: "dette emne er blevet vist {{number}} gange" activity: "Aktivitet" likes: "Synes godt om" - participants: "Deltagere" + users: "Deltagere" category_title: "Kategori" history: "Historik" changed_by: "af {{author}}" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 5731b435792..d5b3eea6640 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -972,7 +972,6 @@ de: title: "Zusammenfassung des Themas" links_shown: "Zeige alle {{totalLinks}} Links..." clicks: "Klicks" - topic_link: "Themenlinks" topic_statuses: locked: @@ -993,7 +992,7 @@ de: activity: "Aktivität" likes: "Gefällt mir" likes_long: "es gibt {{number}} „Gefällt mir“ in diesem Thema" - participants: "Teilnehmer" + users: "Teilnehmer" category_title: "Kategorie" history: "Verlauf" changed_by: "durch {{author}}" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 29084e572a9..c5e44031710 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1007,7 +1007,6 @@ en: title: "Topic Summary" links_shown: "show all {{totalLinks}} links..." clicks: "clicks" - topic_link: "topic link" topic_statuses: locked: @@ -1028,7 +1027,7 @@ en: activity: "Activity" likes: "Likes" likes_long: "there are {{number}} likes in this topic" - participants: "Participants" + users: "Users" category_title: "Category" history: "History" changed_by: "by {{author}}" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 7667999a7d9..9468f88e386 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -747,7 +747,7 @@ es: views_long: "este tema ha sido visto {{number}} veces" activity: "Actividad" likes: "Les gusta" - participants: "Participantes" + users: "Participantes" category_title: "Categoría" history: "Historia" changed_by: "por {{author}}" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 1ccf0271302..30b92f461bc 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -963,7 +963,6 @@ fr: title: "Résumé de la discussion" links_shown: "montrer les {{totalLinks}} liens..." clicks: "clics" - topic_link: "lien de la discussion" topic_statuses: locked: help: "cette discussion est close, elle n'accepte plus de nouvelles réponses" @@ -982,7 +981,7 @@ fr: activity: "Activité" likes: "J'aime" likes_long: "il y a {{number}} j'aime dans cette discussion" - participants: "Participants" + users: "Participants" category_title: "Catégorie" history: "Historique" changed_by: "par {{author}}" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 824a42cd666..b7b7a7936e9 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -593,7 +593,7 @@ id: views_long: "this topic has been viewed {{number}} times" activity: "Activity" likes: "Likes" - participants: "Participants" + users: "Users" category_title: "Category" history: "History" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index abf3069f3e6..8757172309f 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -930,7 +930,6 @@ it: title: "Riepilogo del Topic" links_shown: "mostra tutti i {{totalLinks}} link..." clicks: "click" - topic_link: "topic link" topic_statuses: locked: @@ -950,7 +949,7 @@ it: views_long: "questo topic è stato visto {{number}} volte" activity: "Attività" likes: "Like" - participants: "Partecipanti" + users: "Partecipanti" category_title: "Categoria" history: "Cronologia" changed_by: "di {{author}}" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 3ec0ef8ff4e..5299dd51f3a 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -996,7 +996,6 @@ ko: title: "토픽 요약" links_shown: "모든 {{totalLinks}} 링크 보기..." clicks: "클릭" - topic_link: "토픽 링크" topic_statuses: locked: @@ -1017,7 +1016,7 @@ ko: activity: "활동" likes: "좋아요" likes_long: "이 주제에 {{number}}개의 '좋아요'가 있습니다." - participants: "참여자" + users: "참여자" category_title: "카테고리" history: "기록" changed_by: "{{author}}에 의해" diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 12b087e9c39..d21de55e3cd 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -843,7 +843,6 @@ nb_NO: title: "Emneoppsummering" links_shown: "vis alle {{totalLinks}} linker..." clicks: "klikk" - topic_link: "emnelink" topic_statuses: locked: @@ -863,7 +862,7 @@ nb_NO: views_long: "dette emnet har blit sett {{number}} ganger" activity: "Aktivitet" likes: "Likes" - participants: "Deltakere" + users: "Deltakere" category_title: "Kategori" history: "Historie" changed_by: "av {{author}}" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 18c32180046..970c86bdd7e 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -1001,7 +1001,6 @@ nl: title: "Topic samenvatting" links_shown: "laat alle {{totalLinks}} links zien..." clicks: clicks - topic_link: link naar topic topic_statuses: locked: @@ -1022,7 +1021,7 @@ nl: activity: Activiteit likes: Leuk likes_long: "er zijn {{count}} likes in deze topic" - participants: Deelnemers + users: Deelnemers category_title: Categorie history: Geschiedenis changed_by: "door {{author}}" diff --git a/config/locales/client.pseudo.yml b/config/locales/client.pseudo.yml index 74853d68fdd..14d4359b6ea 100644 --- a/config/locales/client.pseudo.yml +++ b/config/locales/client.pseudo.yml @@ -900,7 +900,6 @@ pseudo: title: '[[ Ťóƿíč Šůɱɱářý ]]' links_shown: '[[ šĥóŵ áłł {{totalLinks}} łíɳǩš... ]]' clicks: '[[ čłíčǩš ]]' - topic_link: '[[ ťóƿíč łíɳǩ ]]' topic_statuses: locked: help: '[[ ťĥíš ťóƿíč íš čłóšéď; íť ɳó łóɳǧéř áččéƿťš ɳéŵ řéƿłíéš ]]' @@ -921,7 +920,7 @@ pseudo: activity: '[[ Áčťíνíťý ]]' likes: '[[ Łíǩéš ]]' likes_long: '[[ ťĥéřé ářé {{number}} łíǩéš íɳ ťĥíš ťóƿíč ]]' - participants: '[[ Рářťíčíƿáɳťš ]]' + users: '[[ Рářťíčíƿáɳťš ]]' category_title: '[[ Čáťéǧóřý ]]' history: '[[ Ĥíšťóřý ]]' changed_by: '[[ ƀý {{author}} ]]' diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 0ee2a7e5000..2725eb5791c 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -558,7 +558,7 @@ pt: views_long: "este tópico foi visto {{number}} vezes" activity: "Atividade" likes: "Gostos" - participants: "Participantes" + users: "Participantes" category_title: "Categoria" categories_list: "Lista de Categorias" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 3fadbf3bdb9..dea5106eace 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -992,7 +992,6 @@ pt_BR: title: "Sumário do Tópico" links_shown: "mostrar todos os {{totalLinks}} links..." clicks: "clicks" - topic_link: "link do tópico" topic_statuses: locked: @@ -1013,7 +1012,7 @@ pt_BR: activity: "Atividade" likes: "Curtidas" likes_long: "há {{number}} curtidas neste tópico" - participants: "Participantes" + users: "Participantes" category_title: "Categoria" history: "Histórico" changed_by: "por {{author}}" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 0147214b34f..d2ccec21739 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -1013,7 +1013,6 @@ ru: title: 'Сводка по теме' links_shown: 'показать все {{totalLinks}} ссылок...' clicks: переходов - topic_link: 'ссылка на тему' topic_statuses: locked: help: 'закрытая тема (в этой теме больше нельзя отвечать)' @@ -1032,7 +1031,7 @@ ru: activity: Активность likes: Нрав. likes_long: '{{number}} лайков в теме' - participants: Участники + users: Участники category_title: Категория history: История changed_by: 'автором {{author}}' diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index c786a27fbaf..bd8c6a10098 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -737,7 +737,7 @@ sv: views_long: "denna tråd har visats {{number}} gånger" activity: "Aktivitet" likes: "Gillningar" - participants: "Deltagare" + users: "Deltagare" category_title: "Kategori" history: "Historik" changed_by: "av {{author}}" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index f1d3d18a9f4..91eda364ad0 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -742,7 +742,7 @@ zh_CN: help: '向你的朋友发送邀请，他们只需要一个点击就能回复这个主题' to_topic: "我们会给你的朋友发送一封邮件，他/她只需点击其中的一个链接，就可以无需登录直接回复这个主题。" to_forum: "我们会给你的朋友发送一封邮件，他/她只需点击其中的链接，就可以注册加入这个论坛。" - + email_placeholder: '电子邮箱地址' success: "谢谢！我们已发送一个邀请邮件到{{email}}。当他们确认的时候我们会通知你。你也可以在你的用户页面的邀请选项卡下查看邀请状态。" error: "抱歉，我们不能邀请此人，可能他/她已经是本站用户了？" @@ -1007,7 +1007,6 @@ zh_CN: title: "主题概要" links_shown: "显示所有 {{totalLinks}} 个链接……" clicks: "点击" - topic_link: "主题链接" topic_statuses: locked: @@ -1028,7 +1027,7 @@ zh_CN: activity: "活动" likes: "赞" likes_long: "本主题已有 {{number}} 次赞" - participants: "参与者" + users: "参与者" category_title: "分类" history: "历史" changed_by: "由 {{author}}" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index fede97c9102..27c11a414a8 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -893,7 +893,6 @@ zh_TW: title: "主題概要" links_shown: "顯示所有 {{totalLinks}} 個鏈接……" clicks: "點擊" - topic_link: "主題鏈接" topic_statuses: locked: @@ -913,7 +912,7 @@ zh_TW: views_long: "本主題已經被浏覽過 {{number}} 次" activity: "活動" likes: "贊" - participants: "參與者" + users: "參與者" category_title: "分類" history: "曆史" changed_by: "由 {{author}}"