Skip to content

Commit 882c77c

Browse files
committed
redaction: when adding link through Push, directly add language description with hit counter
1 parent 092cfa6 commit 882c77c

3 files changed

Lines changed: 25 additions & 24 deletions

File tree

app/assets/javascripts/application.coffee

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,7 @@ $("textarea, #form_answers input").keypress (event) ->
3232
$(@).off event
3333

3434
# Add/Remove dynamically links in the news form
35-
langs =
36-
fr: "Français"
37-
en: "Anglais"
38-
de: "Allemand"
39-
eu: "Basque"
40-
ct: "Catalan"
41-
cn: "Chinois"
42-
ko: "Coréen"
43-
da: "Danois"
44-
es: "Espagnol"
45-
fi: "Finnois"
46-
el: "Grec"
47-
it: "Italien"
48-
ja: "Japonais"
49-
nl: "Néerlandais"
50-
no: "Norvégien"
51-
pl: "Polonais"
52-
pt: "Portugais"
53-
ru: "Russe"
54-
sv: "Suédois"
55-
xx: "!? hmmm ?!"
56-
57-
$("#form_links").nested_fields "news", "link", "lien", "fieldset", title: "text", url: "url", lang: langs
35+
$("#form_links").nested_fields "news", "link", "lien", "fieldset", title: "text", url: "url", lang: window.langs
5836
$("#form_answers").nested_fields "poll", "answer", "choix", "p", answer: "text"
5937

6038
# Mask the contributors if they are too many

app/assets/javascripts/lang.coffee

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Export langs as defined in rails
2+
window.langs =
3+
fr: "Français"
4+
en: "Anglais"
5+
de: "Allemand"
6+
eu: "Basque"
7+
ct: "Catalan"
8+
cn: "Chinois"
9+
ko: "Coréen"
10+
da: "Danois"
11+
es: "Espagnol"
12+
fi: "Finnois"
13+
el: "Grec"
14+
it: "Italien"
15+
ja: "Japonais"
16+
nl: "Néerlandais"
17+
no: "Norvégien"
18+
pl: "Polonais"
19+
pt: "Portugais"
20+
ru: "Russe"
21+
sv: "Suédois"
22+
xx: "!? hmmm ?!"
23+

app/assets/javascripts/redaction.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Redaction
4949

5050
innerHtmlForLink: (msg) ->
5151
"""
52-
<a href="/redirect/#{msg.id}" class="hit_counter">#{msg.title}</a> (#{msg.nb_clicks} clic#{if msg.nb_clicks > 1 then 's' else ''})
52+
<a href="/redirect/#{msg.id}" class="hit_counter">#{msg.title}</a> (#{if msg.lang == 'fr' then '' else 'en ' + window.langs[msg.lang].toLowerCase() + ', '}#{msg.nb_clicks} clic#{if msg.nb_clicks > 1 then 's' else ''})
5353
"""
5454

5555
htmlForLink: (msg) ->

0 commit comments

Comments
 (0)