Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: elixir-lang/elixir-lang.github.com
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: elixir-cn/elixir-lang.github.com
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Jul 5, 2016

  1. translate part of homepage

    lizhe committed Jul 5, 2016
    Copy the full SHA
    5970185 View commit details
  2. translate part of learning

    lizhe committed Jul 5, 2016
    Copy the full SHA
    f233d70 View commit details
Showing with 51 additions and 51 deletions.
  1. +2 −1 .gitignore
  2. +2 −2 _includes/code-editor-support.html
  3. +6 −6 _includes/elixir-radar.html
  4. +9 −9 _includes/important-links.html
  5. +4 −4 _includes/search.html
  6. +2 −2 _includes/sponsors.html
  7. +7 −7 _includes/top.html
  8. +15 −15 index.html
  9. +4 −5 learning.markdown
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/_site
/_site
.bundle
4 changes: 2 additions & 2 deletions _includes/code-editor-support.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="widget">
<h3 class="widget-title">Code editor support</h3>
<h3 class="widget-title">编辑器支持</h3>
<ul>
<li><a class="spec" href="https://github.com/elixir-lang/emacs-elixir">Emacs Mode</a></li>
<li><a class="spec" href="http://www.alchemist-elixir.org/">Alchemist (Emacs Elixir Tooling)</a></li>
<li><a class="spec" href="https://github.com/elixir-lang/elixir-tmbundle">TextMate / Sublime Text Bundle</a></li>
<li><a class="spec" href="https://github.com/vishnevskiy/ElixirSublime">Sublime Plugin</a></li>
<li><a class="spec" href="https://github.com/vishnevskiy/ElixirSublime">Sublime 插件</a></li>
<li><a class="spec" href="https://github.com/elixir-lang/vim-elixir">Vim Elixir</a></li>
<li><a class="spec" href="https://github.com/SteffenBauer/elixir-gtksourceview">GtkSourceView (gedit)</a></li>
<li><a class="spec" href="https://github.com/lucasmazza/language-elixir">Atom Package</a></li>
12 changes: 6 additions & 6 deletions _includes/elixir-radar.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<div id="elixir-radar" class="widget">
<h3 class="widget-title">Elixir Radar</h3>
<h3 class="widget-title">Elixir 雷达</h3>
<p>
A weekly Elixir email newsletter with content curated by Plataformatec. <strong>Subscribe below</strong>.
Plataformatec 总结的 Elixir 相关内容的周刊邮件。 <strong>点击下面的按钮开始订阅</strong>.
</p>
<div class="elixir-radar-cta">
<div class="cta-copy">
<div class="cta-title">
Elixir Radar
Elixir 雷达
</div>
<div class="cta-subtitle">
weekly newsletter
周刊邮件
</div>
</div>
<div class="cta-button-container">
<a href="http://plataformatec.com.br/elixir-radar?utm_campaign=elixir_lang_cta&utm_medium=cta&utm_source=elixir_lang_website" class="cta-button">
Subscribe now
现在订阅
</a>
</div>
</div>
</div>
</div>
18 changes: 9 additions & 9 deletions _includes/important-links.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<div class="widget">
<h3 class="widget-title">Join the Community</h3>
<h3 class="widget-title">加入社区</h3>
<ul>
<li><a class="spec" href="irc://irc.freenode.net/elixir-lang">#elixir-lang on freenode IRC</a></li>
<li><a class="spec" href="https://elixir-slackin.herokuapp.com/">Elixir on Slack</a></li>
<li><a class="spec" href="http://elixirforum.com">Elixir Forum</a></li>
<li><a class="spec" href="https://groups.google.com/group/elixir-lang-talk">elixir-talk mailing list</a></li>
<li><a class="spec" href="http://elixirforum.com">Elixir 论坛</a></li>
<li><a class="spec" href="https://groups.google.com/group/elixir-lang-talk">elixir-talk 邮件列表</a></li>
<li><a class="spec" href="https://twitter.com/elixirlang">@elixirlang on Twitter</a></li>
<li><a class="spec" href="http://elixir.meetup.com">Meetups around the world</a></li>
<li><a class="spec" href="https://github.com/elixir-lang/elixir/wiki">Wiki with events, resources and talks organized by the community</a></li>
<li><a class="spec" href="http://elixir.meetup.com">全世界的活动</a></li>
<li><a class="spec" href="https://github.com/elixir-lang/elixir/wiki">社区整理的关于活动,资源,演讲的 Wiki</a></li>
</ul>
</div>

<div class="widget">
<h3 class="widget-title">Important links</h3>
<h3 class="widget-title">重要链接</h3>
<ul>
<li><a class="spec" href="https://github.com/elixir-lang/elixir">Source Code</a></li>
<li><a class="spec" href="https://github.com/elixir-lang/elixir">源码</a></li>
<li><a class="spec" href="https://github.com/elixir-lang/elixir/issues">Issue tracker</a></li>
<li><a class="spec" href="https://groups.google.com/group/elixir-lang-core">elixir-core mailing list (development)</a></li>
<li><a class="spec" href="/crash-course.html">Crash course for Erlang developers</a></li>
<li><a class="spec" href="https://groups.google.com/group/elixir-lang-core">elixir-core 邮件列表 (development)</a></li>
<li><a class="spec" href="/crash-course.html">Crash course for Erlang 开发者</a></li>
</ul>
</div>
8 changes: 4 additions & 4 deletions _includes/search.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div class="widget news">
<h3>
News: <a href="/blog/2016/06/21/elixir-v1-3-0-released/">Elixir v1.3 released</a>
新闻: <a href="/blog/2016/06/21/elixir-v1-3-0-released/">Elixir v1.3 发布</a>
</h3>
</div>

<div class="widget search">
<form method="get" id="search-form" class="search-form" action="https://www.google.com/search">
<div>
<input class="search-text" type="text" name="q" placeholder="Search..." id="searchfield">
<input class="search-text" type="text" name="q" placeholder="搜索..." id="searchfield">
<input type="hidden" name="sitesearch" value="elixir-lang.org">
<input class="search-submit button" name="submit" type="submit" value="Search">
<input class="search-submit button" name="submit" type="submit" value="搜索">
</div>
</form>
</div>
</div>
4 changes: 2 additions & 2 deletions _includes/sponsors.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="sponsors" class="widget">
<h3 class="widget-title">Sponsors</h3>
<h3 class="widget-title">赞助者</h3>
<ul>
<li class="image"><a href="http://plataformatec.com.br" title="Plataformatec"><img src="/images/logo/plataformatec.png" alt="Plataformatec Logo" width="190" height="74" /></a></li>
</ul>
</div>
</div>
14 changes: 7 additions & 7 deletions _includes/top.html
Original file line number Diff line number Diff line change
@@ -41,13 +41,13 @@ <h1 id="site-title">
<div id="menu-primary" class="menu-container">
<div class="menu">
<ul id="menu-primary-items">
<li class="menu-item home"><a class="spec" href="/">Home</a></li>
<li class="menu-item install"><a class="spec" href="/install.html">Install</a></li>
<li class="menu-item getting-started"><a class="spec" href="/getting-started/introduction.html">Getting Started</a></li>
<li class="menu-item learning"><a class="spec" href="/learning.html">Learning</a></li>
<li class="menu-item docs"><a class="spec" href="/docs.html">Docs</a></li>
<li class="menu-item blog"><a class="spec" href="/blog/">Blog</a></li>
<li class="menu-item packages"><a class="spec" href="https://hex.pm/">Packages</a></li>
<li class="menu-item home"><a class="spec" href="/">主页</a></li>
<li class="menu-item install"><a class="spec" href="/install.html">安装</a></li>
<li class="menu-item getting-started"><a class="spec" href="/getting-started/introduction.html">入门指南</a></li>
<li class="menu-item learning"><a class="spec" href="/learning.html">学习资源</a></li>
<li class="menu-item docs"><a class="spec" href="/docs.html">文档</a></li>
<li class="menu-item blog"><a class="spec" href="/blog/">博客</a></li>
<li class="menu-item packages"><a class="spec" href="https://hex.pm/"></a></li>
</ul>
</div>
</div>
30 changes: 15 additions & 15 deletions index.html
Original file line number Diff line number Diff line change
@@ -8,20 +8,21 @@
<img src="/images/contents/home-code.png" alt="Elixir Sample" class="archive-thumbnail" />

<div class="entry-summary">
<p>Elixir is a dynamic, functional language designed for building scalable and maintainable applications.</p>
<p>Elixir 是一门动态函数式语言,它是为了创建可扩展,可维护的应用程序而设计的</p>

<p>Elixir leverages the Erlang VM, known for running low-latency, distributed and fault-tolerant systems, while also being successfully used in web development and the embedded software domain.</p>

<p>To learn more about Elixir, check our <a href="/getting-started/introduction.html">getting started guide</a>. Or keep reading to get an overview of the platform, language and tools.</p>
<p>
Elixir 利用了 Erlang VM,它因为低延迟,分布式,容错而广受赞誉,同时也在 Web开发,嵌入式等领域也正在取得成功。
</p>
<p>想要获得更多关于 Elixir 的信息, 请查看 <a href="/getting-started/introduction.html">入门指南</a>。或者继续阅读下面的内容,以了解整个平台,语言,工具的概览情况。</p>
</div>
</div>

<div class="hentry post">
<h3>Platform features</h3>
<h3>平台特性</h3>
</div>

<div class="hentry post">
<h4>Scalability</h4>
<h4>可扩展</h4>
<div class="entry-summary">

<p>All Elixir code runs inside lightweight threads of execution (called processes) that are isolated and exchange information via messages:</p>
@@ -47,7 +48,7 @@ <h4>Scalability</h4>
</div>

<div class="hentry post">
<h4>Fault-tolerance</h4>
<h4>容错</h4>

<div class="entry-summary">
<p>The unavoidable truth about software running in production is that <i>things will go wrong</i>. Even more when we take network, file systems and other third-party resources into account.</p>
@@ -68,11 +69,11 @@ <h4>Fault-tolerance</h4>
</div>

<div class="hentry post">
<h3>Language features</h3>
<h3>语言特性</h3>
</div>

<div class="hentry post">
<h4>Functional programming</h4>
<h4>函数式编程</h4>

<div class="entry-summary">
<p>Functional programming promotes a coding style that helps developers write code that is short, fast, and maintainable. For example, pattern matching allows developers to easily destructure data and access its contents:</p>
@@ -98,7 +99,7 @@ <h4>Functional programming</h4>
</div>

<div class="hentry post">
<h4>Extensibility and DSLs</h4>
<h4>扩展能力和 DSL</h4>

<div class="entry-summary">
<p>Elixir has been designed to be extensible, letting developers naturally extend the language to particular domains, in order to increase their productivity.</p>
@@ -120,11 +121,11 @@ <h4>Extensibility and DSLs</h4>
</div>

<div class="hentry post">
<h3>Tooling features</h3>
<h3>工具特性</h3>
</div>

<div class="hentry post">
<h4>A growing ecosystem</h4>
<h4>一个快速增长的生态环境</h4>

<div class="entry-summary">
<p>Elixir ships with a great set of tools to ease development. <a href="/docs/stable/mix/">Mix is a build tool</a> that allows you to easily create projects, manage tasks, run tests and more:</p>
@@ -144,7 +145,7 @@ <h4>A growing ecosystem</h4>
</div>

<div class="hentry post">
<h4>Interactive development</h4>
<h4>交互式开发</h4>

<div class="entry-summary">
<p>Tools like <a href="/docs/stable/iex/">IEx (Elixir&rsquo;s interactive shell)</a> are able to leverage many aspects of the language and platform to provide auto-complete, debugging tools, code reloading, as well as nicely formatted documentation:</p>
@@ -161,7 +162,7 @@ <h4>Interactive development</h4>
</div>

<div class="hentry post">
<h4>Erlang compatible</h4>
<h4>Erlang 兼容</h4>

<div class="entry-summary">
<p>Elixir runs on the Erlang VM giving developers complete access to Erlang&rsquo;s ecosystem, used by companies like <a href="https://www.heroku.com">Heroku</a>, <a href="http://www.whatsapp.com">WhatsApp</a>, <a href="https://klarna.com">Klarna</a>, <a href="http://basho.com">Basho</a> and many more to build distributed, fault-tolerant applications. An Elixir programmer can invoke any Erlang function with no runtime cost:</p>
@@ -175,4 +176,3 @@ <h4>Erlang compatible</h4>
</div>
</div>
</div>

9 changes: 4 additions & 5 deletions learning.markdown
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Learning resources"
title: "学习资源"
section: learning
layout: default
---
@@ -12,7 +12,7 @@ Our website provides a [Getting Started](/getting-started/introduction.html) gui

The Elixir Community has also produced plenty of resources to explore Elixir from different backgrounds and other perspectives. We are sure you will find a resource that follows your pace and interests.

## Learn Elixir
## 学习 Elixir

<h4 class="resource">Programming Elixir 1.2</h4>

@@ -82,7 +82,7 @@ Red:4 is a fictional aerospace startup that needs your help! Through a book, a v
<div class="clear"></div>


## Screencasts
## 视频教程

<h4 class="resource">Elixir Sips</h4>

@@ -107,7 +107,7 @@ It's intended to help beginners get familiar with all of Elixir's features by bu

<div class="clear"></div>

## In-depth Resources
## 更加深入的资源

<h4 class="resource">Études for Elixir</h4>

@@ -134,4 +134,3 @@ Write code that writes code with Elixir macros. Macros make metaprogramming poss
This book intends to be a little guide about how to be the Erlang medic in a time of war. It is first and foremost a collection of tips and tricks to help understand where failures come from, and a dictionary of different code snippets and practices that helped developers debug production systems that were built in Erlang.

<div class="clear"></div>