8000 Replace flags with endonyms to link to localization by eed3si9n · Pull Request #449 · scala/docs.scala-lang · GitHub
[go: up one dir, main page]
Skip to content

Replace flags with endonyms to link to localization #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2015
Merged

Replace flags with endonyms to link to localization #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 86 additions & 0 deletions _data/languages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
ar:
name: "العربية"

bn:
name: "বাংলা"

ca:
name: "Català"

cs:
name: "Čeština"

de:
name: "Deutsch"

en:
name: "English"

es:
name: "Español"

fa:
name: "فارسی"

fi:
name: "Suomi"

fr:
name: "Français"

he:
name: "עברית"

hi:
name: "हिन्दी"

hu:
name: "Magyar"

id:
name: "Bahasa Indonesia"

it:
name: "Italiano"

ja:
name: "日本語"

ko:
name: "한국어"

nl:
name: "Nederlands"

no:
name: "Norsk (Bokmål)"

pl:
name: "Polski"

pt:
name: "Português"

"pt-br":
name: "Português (Brasil)"

ru:
name: "Русский"

sv:
name: "Svenska"

tr:
name: "Türkçe"

vi:
name: "Tiếng Việt"

uk:
name: "Українська"

"zh-cn":
name: "中文 (简体)"

"zh-tw":
name: "中文 (繁體)"
12 changes: 8 additions & 4 deletions _includes/cheatsheet-sidebar.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@
<div id="scroller-anchor">
<div id="scroller">
{% if languages %}
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en" style="margin-left: 14px;"/></a>
{% for l in languages %}
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
{% endfor %}
<p class="contents">Languages</p>
<ul class="langbar langbar-cheatsheet">
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
{% for l in languages %}
{% assign lang = site.data.languages[l] %}
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
{% endfor %}
</ul>
{% endif %}
<p class="contents">Contents</p>
<div id="toc"></div>
Expand Down
7 changes: 5 additions & 2 deletions _layouts/guides-index.html
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ <h1>About</h1>
-->

{% if languages %}
<a href="{{ site.baseurl }}{{ rootIndexURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
<ul class="langbar index-langbar">
<li><a href="{{ site.baseurl }}{{ rootIndexURL }}" class="lang">English</a></li>
{% for l in languages %}
<a href="{{ site.baseurl }}/{{ l }}{{ rootIndexURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
{% assign lang = site.data.languages[l] %}
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootIndexURL }}" class="lang">{{lang.name}}</a></li>
{% endfor %}
</ul>
{% endif %}
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions _layouts/overview-large.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@

<div class="span6">
{% if languages %}
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
<ul class="langbar">
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
{% for l in languages %}
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
{% assign lang = site.data.languages[l] %}
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
{% endfor %}
</ul>
{% endif %}
</div>

Expand Down
8 changes: 5 additions & 3 deletions _layouts/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<div class="container">
<div class="row">

<div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>

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

<div class="span6">
{% if languages %}
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
<ul class="langbar">
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
{% for l in languages %}
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
{% assign lang = site.data.languages[l] %}
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
{% endfor %}
</ul>
{% endif %}
</div>

Expand Down
17 changes: 10 additions & 7 deletions _layouts/tutorial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

{% for pg in site.pages %}
{% if pg.tutorial == "scala-tour" and pg.languages %}
{% assign lang = pg.languages %}
{% assign languages = pg.languages %}
{% endif %}
{% endfor %}

Expand All @@ -24,12 +24,15 @@
{% endif %}

<div class="span6">
{% if lang %}
<a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
{% for l in lang %}
<a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
{% endfor %}
{% endif %}
{% if languages %}
<ul class="langbar">
<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
{% for l in languages %}
{% assign lang = site.data.languages[l] %}
<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
{% endfor %}
</ul>
{% endif %}
</div>

<div class="span10">
Expand Down
Binary file removed resources/images/language/de.png
View file
Open in desktop
Binary file not shown.
Binary file removed resources/images/language/en.png
View file
Open in desktop
Binary file not shown.
Binary file removed resources/images/language/es.png
View file
Open in desktop
Binary file not shown.
Binary file removed resources/images/language/fr.png
View file
Open in desktop
Binary file not shown.
Binary file removed resources/images/language/ja.png
View file
Open in desktop
Binary file not shown.
Binary file removed resources/images/language/ko.png
View file
Open in desktop
Binary file not shown.
Binary file removed resources/images/language/pt-br.png
View file
Open in desktop
Binary file not shown.
20 changes: 20 additions & 0 deletions resources/stylesheets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,26 @@
font-style: italic;
}

.langbar li {
display: inline;
}

.langbar-cheatsheet li {
display: block;
}

.langbar li a {
color: rgba(0, 0, 0, 0.5);
font-weight: bold;
text-decoration: none;
font-size: 14px;
margin-right: 5px;
}

.langbar li a:hover {
text-decoration: underline;
}

/*Coursera stuff*/

.label {
Expand Down
0