Skip to content

Commit a4b18c8

Browse files
heathermillerheathermiller
committed
Merge pull request #449 from eed3si9n/topic/endonym
Replace flags with endonyms to link to localization
2 parents 84722c8 + 9cc9552 commit a4b18c8

File tree

14 files changed

+139
-18
lines changed

14 files changed

+139
-18
lines changed

‎_data/languages.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
ar:
2+
name: "العربية"
3+
4+
bn:
5+
name: "বাংলা"
6+
7+
ca:
8+
name: "Català"
9+
10+
cs:
11+
name: "Čeština"
12+
13+
de:
14+
name: "Deutsch"
15+
16+
en:
17+
name: "English"
18+
19+
es:
20+
name: "Español"
21+
22+
fa:
23+
name: "فارسی"
24+
25+
fi:
26+
name: "Suomi"
27+
28+
fr:
29+
name: "Français"
30+
31+
he:
32+
name: "עברית"
33+
34+
hi:
35+
name: "हिन्दी"
36+
37+
hu:
38+
name: "Magyar"
39+
40+
id:
41+
name: "Bahasa Indonesia"
42+
43+
it:
44+
name: "Italiano"
45+
46+
ja:
47+
name: "日本語"
48+
49+
ko:
50+
name: "한국어"
51+
52+
nl:
53+
name: "Nederlands"
54+
55+
no:
56+
name: "Norsk (Bokmål)"
57+
58+
pl:
59+
name: "Polski"
60+
61+
pt:
62+
name: "Português"
63+
64+
"pt-br":
65+
name: "Português (Brasil)"
66+
67+
ru:
68+
name: "Русский"
69+
70+
sv:
71+
name: "Svenska"
72+
73+
tr:
74+
name: "Türkçe"
75+
76+
vi:
77+
name: "Tiếng Việt"
78+
79+
uk:
80+
name: "Українська"
81+
82+
"zh-cn":
83+
name: "中文 (简体)"
84+
85+
"zh-tw":
86+
name: "中文 (繁體)"

‎_includes/cheatsheet-sidebar.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414
<div id="scroller-anchor">
1515
<div id="scroller">
1616
{% if languages %}
17-
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en" style="margin-left: 14px;"/></a>
18-
{% for l in languages %}
19-
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
20-
{% endfor %}
17+
<p class="contents">Languages</p>
18+
<ul class="langbar langbar-cheatsheet">
19+
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
20+
{% for l in languages %}
21+
{% assign lang = site.data.languages[l] %}
22+
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
23+
{% endfor %}
24+
</ul>
2125
{% endif %}
2226
<p class="contents">Contents</p>
2327
<div id="toc"></div>

‎_layouts/guides-index.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ <h1>About</h1>
3030
-->
3131

3232
{% if languages %}
33-
<a href="{{ site.baseurl }}{{ rootIndexURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
33+
<ul class="langbar index-langbar">
34+
<li><a href="{{ site.baseurl }}{{ rootIndexURL }}" class="lang">English</a></li>
3435
{% for l in languages %}
35-
<a href="{{ site.baseurl }}/{{ l }}{{ rootIndexURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
36+
{% assign lang = site.data.languages[l] %}
37+
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootIndexURL }}" class="lang">{{lang.name}}</a></li>
3638
{% endfor %}
39+
</ul>
3740
{% endif %}
3841
</div>
3942
</div>

‎_layouts/overview-large.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525

2626
<div class="span6">
2727
{% if languages %}
28-
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
28+
<ul class="langbar">
29+
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
2930
{% for l in languages %}
30-
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
31+
{% assign lang = site.data.languages[l] %}
32+
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
3133
{% endfor %}
34+
</ul>
3235
{% endif %}
3336
</div>
3437

‎_layouts/overview.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<div class="container">
88
<div class="row">
9-
109
<div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>
1110

1211
{% for pg in site.posts %}
@@ -30,10 +29,13 @@
3029

3130
<div class="span6">
3231
{% if languages %}
33-
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
32+
<ul class="langbar">
33+
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
3434
{% for l in languages %}
35-
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
35+
{% assign lang = site.data.languages[l] %}
36+
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
3637
{% endfor %}
38+
</ul>
3739
{% endif %}
3840
</div>
3941

‎_layouts/tutorial.html

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
{% for pg in site.pages %}
1414
{% if pg.tutorial == "scala-tour" and pg.languages %}
15-
{% assign lang = pg.languages %}
15+
{% assign languages = pg.languages %}
1616
{% endif %}
1717
{% endfor %}
1818

@@ -24,12 +24,15 @@
2424
{% endif %}
2525

2626
<div class="span6">
27-
{% if lang %}
28-
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
29-
{% for l in lang %}
30-
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
31-
{% endfor %}
32-
{% endif %}
27+
{% if languages %}
28+
<ul class="langbar">
29+
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
30+
{% for l in languages %}
31+
{% assign lang = site.data.languages[l] %}
32+
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
33+
{% endfor %}
34+
</ul>
35+
{% endif %}
3336
</div>
3437

3538
<div class="span10">

‎resources/images/language/de.png

-483 Bytes
Binary file not shown.

‎resources/images/language/en.png

-1.15 KB
Binary file not shown.

‎resources/images/language/es.png

-666 Bytes
Binary file not shown.

‎resources/images/language/fr.png

-536 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)