Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/javascripts/application.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ $("textarea, #form_answers input").keypress (event) ->

# Add/Remove dynamically links in the news form
langs =
xx: "!? hmmm ?!"
fr: "Français"
de: "Allemand"
en: "Anglais"
eu: "Basque"
ct: "Catalan"
cn: "Chinois"
wq: "Code/binaire"
ko: "Coréen"
da: "Danois"
es: "Espagnol"
Expand All @@ -53,8 +55,6 @@ langs =
pt: "Portugais"
ru: "Russe"
sv: "Suédois"
xx: "!? hmmm ?!"
wq: "Code/binaire"

$("#form_links").nested_fields "news", "link", "lien", "fieldset", title: "text", url: "url", lang: langs
$("#form_answers").nested_fields "poll", "answer", "choix", "p", answer: "text"
Expand Down
10 changes: 10 additions & 0 deletions app/assets/stylesheets/contrib/grayscale.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2311,6 +2311,11 @@ form#new_diary > p:nth-child(4) {
position: relative;
top: 2px;
}
*:not(.markItUpHeader) > ul > .link[lang="ee"]:before {
content: url("/images/langs/ee.png");
position: relative;
top: 2px;
}
*:not(.markItUpHeader) > ul > .link[lang="el"]:before {
content: url("/images/contrib/grayscale/flags/el.png");
position: relative;
Expand Down Expand Up @@ -2391,6 +2396,11 @@ form#new_diary > p:nth-child(4) {
position: relative;
top: 2px;
}
*:not(.markItUpHeader) > ul > .link[lang="wq"]:before {
content: url("/images/langs/wq.png");
position: relative;
top: 2px;
}
#phare .link,
#phare .meta,
#phare footer {
Expand Down
6 changes: 6 additions & 0 deletions app/assets/stylesheets/contrib/kaiska-new.scss
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,9 @@ li.link[lang="da"] {
li.link[lang="de"] {
list-style: url("/images/langs/de.png");
}
li.link[lang="ee"] {
list-style: url("/images/langs/ee.png");
}
li.link[lang="el"] {
list-style: url("/images/langs/el.png");
}
Expand Down Expand Up @@ -811,6 +814,9 @@ li.link[lang="sv"] {
li.link[lang="xx"] {
list-style: url("/images/langs/xx.png");
}
li.link[lang="wq"] {
list-style: url("/images/langs/wq.png");
}

div.content a[href^="/wiki/"],
div.content a[href^="//linuxfr.org/wiki/"] {
Expand Down
6 changes: 6 additions & 0 deletions app/assets/stylesheets/contrib/solarized/langs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ li.link[lang="da"] {
li.link[lang="de"] {
list-style-image: url("/images/langs/de.png");
}
li.link[lang="ee"] {
list-style-image: url("/images/langs/ee.png");
}
li.link[lang="el"] {
list-style-image: url("/images/langs/el.png");
}
Expand Down Expand Up @@ -63,3 +66,6 @@ li.link[lang="sv"] {
li.link[lang="xx"] {
list-style-image: url("/images/langs/xx.png");
}
li.link[lang="wq"] {
list-style-image: url("/images/langs/wq.png");
}
2 changes: 1 addition & 1 deletion app/views/bookmarks/_preview.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
- c.image = mini_avatar_img(preview.node.user)
- c.body = capture do
%ul
%li{lang: preview.lang}= "#{link_to preview.link, preview.link, hreflang: preview.lang}".html_safe
%li.link{lang: preview.lang}= "#{link_to preview.link, preview.link, hreflang: preview.lang}".html_safe
6 changes: 3 additions & 3 deletions db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
Logo.image = '/images/logos/linuxfr2_classic.png'

# Langs
Lang['fr'] = 'Français'
Lang['xx'] = '!? hmmm ?!' # default choice
Lang['fr'] = 'Français' # main language, then others sorted
Lang['de'] = 'Allemand'
Lang['en'] = 'Anglais'
Lang['eu'] = 'Basque'
Lang['ct'] = 'Catalan'
Lang['cn'] = 'Chinois'
Lang['wq'] = 'Code/binaire'
Lang['ko'] = 'Coréen'
Lang['da'] = 'Danois'
Lang['es'] = 'Espagnol'
Expand All @@ -24,8 +26,6 @@
Lang['pt'] = 'Portugais'
Lang['ru'] = 'Russe'
Lang['sv'] = 'Suédois'
Lang['xx'] = '!? hmmm ?!'
Lang['wq'] = 'Code/binaire'

# Category
%w(Autres Administration\ site Commentaires Feuilles\ de\ style\ (CSS) Dépêches Forums Journaux Modération Proposition Recherche Sondages Suivi Barre\ d’outils Tribune Wiki Avatars Étiquettes Vieux\ navigateurs Comptes\ utilisateurs Statistiques Rédaction Administration\ système À\ ranger\ quelque\ part Aide\ et\ documentation Notifications Syntaxe\ markdown API\ OAuth Images Flux\ Atom Epub Liens).each do |cat|
Expand Down