Merge branch 'enshahar-translate-ko'

flamearrow · May 6, 2014 · bb1cc0d · bb1cc0d
2 parents 0fcd891 + fee5a24
commit bb1cc0d
Show file tree

Hide file tree

Showing 18 changed files with 5,716 additions and 6 deletions.
diff --git a/web/_config.yml b/web/_config.yml
@@ -2,103 +2,130 @@ permalink: none
 lessons:
   - 
     title: Basics
+    title_ko: 기초
     title_ru: Основы
     title_zh_cn: 基础
     url: basics.html
     desc: Values, functions, classes, methods, inheritance, try-catch-finally. Expression-oriented programming
+    desc_ko: 값, 함수, 클래스, 메소드, 상속, try-catch-finally. 식 중심의 프로그래밍
     desc_ru: Переменные, функции, классы, методы, наследование, try-catch-finally. Программирование ориентированное на выражения
     desc_zh_cn: 值，函数，类，方法，继承，try-catch-finally。面向表达式编程
   -
     title: Basics continued
+    title_ko: 기초(계속)
     title_ru: Основы языка. Продолжение
     title_zh_cn: 基础知识（续）
     url: basics2.html
     desc: Case classes, objects, packages, apply, update, Functions are Objects (uniform access principle), pattern matching.
+    desc_ko: 케이스 클래스, 객체, 패키지, apply, update, 함수는 객체이다(동일한 억세스 원칙), 패턴 매치
     desc_ru: Case классы, объекты, пакеты, apply, update, Функции как Объекты (единый принцип доступа), сопоставление с образцом.
     desc_zh_cn: 样本类，对象，包，应用，更新，函数即对象（统一访问原则），模式匹配。
   -
     title: Collections
+    title_ko: 컬렉션
     title_ru: Коллекции
     title_zh_cn: 集合
     url: collections.html
     desc: Lists, Maps, functional combinators (map, foreach, filter, zip, folds)
+    desc_ko: 리스트, 맵, 함수 콤비네이터(map, foreach, filter, zip, fold들)
     desc_ru: Списки, Карты, функциональные комбинаторы (map, foreach, filter, zip, folds)
     desc_zh_cn: 列表，映射，功能组合(map, foreach, filter, zip, folds)
   -
     title: Pattern matching & functional composition
+    title_ko: 패턴 매치와 함수 합성
     title_ru: Сопоставление с образцом и функкциональная композиция
     title_zh_cn: 模式匹配与函数组合
     url: pattern-matching-and-functional-composition.html
     desc: More functions! PartialFunctions, more Pattern Matching
+    desc_ko: 함수에 대한 추가 설명, 부분함수, 패턴 매치에 대한 설명
     desc_ru: Еще больше функций! Частичные функции, еще больше сопоставления с образцом
     desc_zh_cn: 更多函数！偏函数，更多模式匹配
   -
     title: Type & polymorphism basics
+    title_ko: 타입과 다형성의 기초
     title_ru: Основы типов и полиморфизма
     title_zh_cn: 类型和多态基础
     url: type-basics.html
     desc: Basic Types and type polymorphism, type inference, variance, bounds, quantification
+    desc_ko: 기본 타입, 타입 다형성, 타입 추론, 공변성, 바운드, 한정하기
     desc_ru: Основные типы и полиморфизм типов, вывод типов, изменчивость, пределы, квантификация
     desc_zh_cn: 基本类型和类型多态性，类型推断，变性，边界，量化
   -
     title: Advanced types
+    title_ko: 타입(고급 주제)
     title_ru: Дополнительные типы
     title_zh_cn: 高级类型
     url: advanced-types.html
     desc: Advanced Types, view bounds, higher-kinded types, recursive types, structural types
+    desc_ko: 타입에 대한 추가 설명, 뷰 바운드, 상류 타입, 재귀적 타입, 구조적 타입
     desc_ru: Дополнительные типы, видимое ограничение, типы высшего порядка, рекурсивные типы, структурные типы
     desc_zh_cn: 高级类型，视界，更高级多态性类型，递归类型，结构类型
   -
     title: Simple Build Tool
+    title_ko: SBT
     title_ru: Simple Build Tool
     title_zh_cn: 简单构建工具
     url: sbt.html
     desc: All about SBT, the standard Scala build tool
+    desc_ko: 표준 스칼라 빌드 도구인 SBT에 대한 설명
     desc_ru: Все о SBT, Стандартное средство сборки приложений для Scala
     desc_zh_cn: 关于SBT——标准的Scala构建工具
   -
     title: More collections
+    title_ko: 컬렉션(계속)
     title_ru: Подробнее о коллекциях
     title_zh_cn: 更多的集合
     url: coll2.html
     desc: Tour of the Scala Collections library
+    desc_ko: 스칼라 컬렉션 라이브러리 소개
     desc_ru: Рассказ о библиотеке коллекций Scala
     desc_zh_cn: Scala Collections库指南
   -
     title: Testing with specs
+    title_ko: specs로 테스트하기
     title_ru: Тестирование с помощью specs
     title_zh_cn: 使用specs测试
     url: specs.html
+    desc_ko: Scala 테스트 프레임워크 Specs로 테스트하기
     desc_ru: Написание тестов с помощью Specs, Scala BDD фреймфорк для тестирования
   -
     title: Concurrency in Scala
+    title_ko: 스칼라의 동시성
     title_ru: Параллельность в Scala
     title_zh_cn: Scala 并发编程
     url: concurrency.html
     desc: Runnable, Callable, threads, Futures
+    desc_ko: Runnable, Callable, 쓰레드, Future
     desc_ru: Runnable, Callable, потоки, Futures
     desc_zh_cn: Runnable, Callable, 线程, Futures
   -
     title: Java + Scala
+    title_ko: Java + Scala
     title_ru: Java + Scala
     title_zh_cn: Java + Scala
     url: java.html
     desc: 'Java interop: Using Scala from Java'
+    desc_ko: '자바에서 스칼라 사용하기'
     desc_ru:  'Java совместимость: Использование Scala из Java'
     desc_zh_cn:  'Java跨平台交互：在Java中使用Scala'
   -
     title: An introduction to Finagle
+    title_ko: 피네이글(Finagle) 소개
     title_ru: Введение в Finagle
     title_zh_cn: Finagle介绍
     url: finagle.html
     desc: 'Finagle primitives: Future, Service, Filter, Builder'
+    desc_ko: '피네이글 기본 요소: Future, Servie, Filter, Builder'
     desc_ru: 'Finagle примитивы: Future, Service, Filter, Builder'
     desc_zh_cn: 'Finagle原语：Future, Service, Filter, Builder'
   -
     title: Searchbird
+    title_ko: 검색조(Searchbird)
     title_ru: Searchbird
     title_zh_cn: Searchbird
     url: searchbird.html
     desc: Building a distributed search engine using Finagle
+    desc_ko: 피네이글로 분산 검색 엔진 만들기
     desc_ru: Создание распределенного поискового движка, используя Finagle
-    desc_zh_cn: 利用Finagle构建一个分布式搜索引擎
+    desc_zh_cn: 利用Finagle构建一个分布式搜索引擎
+
diff --git a/web/_layouts/default.html b/web/_layouts/default.html
@@ -26,12 +26,33 @@
       {{ content }}
 
     </div> <!-- /container -->
-
+          Built at <a href="http://twitter.com/twitter"
+          target="_blank">@twitter</a> by
+          <a href="http://twitter.com/stevej" target="_blank">@stevej</a>,
+          <a href="http://twitter.com/marius" target="_blank">@marius</a>, and
+          <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a>
+          with much help from
+          <a href="http://twitter.com/evanm" target="_blank">@evanm</a>,
+          <a href="http://twitter.com/sprsquish"
+          target="_blank">@sprsquish</a>,
+          <a href="http://twitter.com/kevino" target="_blank">@kevino</a>,
+          <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>,
+          <a href="http://twitter.com/timtrueman"
+          target="_blank">@timtrueman</a>,
+          <a href="http://twitter.com/wickman" target="_blank">@wickman</a>,
+          and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>;
+          Russian translation by
+          <a href="https://github.com/appigram">appigram</a>;
+          Chinese simple translation by
+          <a href="https://github.com/jasonqu">jasonqu</a>;
+          Korean translation by
+          <a href="https://github.com/enshahar">enshahar</a>;<br />
+          <br />
     <div id="footer">
       <div class="inner">
         <div class="container">
           <p>
-            Built at <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/stevej" target="_blank">@stevej</a>, <a href="http://twitter.com/marius" target="_blank">@marius</a>, and <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a> with much help from <a href="http://twitter.com/evanm" target="_blank">@evanm</a>, <a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>, <a href="http://twitter.com/kevino" target="_blank">@kevino</a>, <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>, <a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>, <a href="http://twitter.com/wickman" target="_blank">@wickman</a> and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>; Russian translation by <a href="https://github.com/appigram">appigram</a>; Chinese simple translation by <a href="https://github.com/jasonqu">jasonqu</a><br />
+
             Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
           </p>
         </div>

diff --git a/web/_layouts/post.html b/web/_layouts/post.html
@@ -43,8 +43,31 @@ <h3><a href="index.html">{{ page.title }}</a></h3>
       <div class="inner">
         <div class="container">
           <p>
-            Built at <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/stevej" target="_blank">@stevej</a>, <a href="http://twitter.com/marius" target="_blank">@marius</a>, and <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a> with much help from <a href="http://twitter.com/evanm" target="_blank">@evanm</a>, <a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>, <a href="http://twitter.com/kevino" target="_blank">@kevino</a>, <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>, <a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>, <a href="http://twitter.com/wickman" target="_blank">@wickman</a> and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>; Russian translation by <a href="https://github.com/appigram">appigram</a>; Chinese simple translation by <a href="https://github.com/jasonqu">jasonqu</a><br />
-            Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
+
+          Built at <a href="http://twitter.com/twitter"
+          target="_blank">@twitter</a> by
+          <a href="http://twitter.com/stevej" target="_blank">@stevej</a>,
+          <a href="http://twitter.com/marius" target="_blank">@marius</a>, and
+          <a href="http://twitter.com/lahosken" target="_blank">@lahosken</a>
+          with much help from
+          <a href="http://twitter.com/evanm" target="_blank">@evanm</a>,
+          <a href="http://twitter.com/sprsquish"
+          target="_blank">@sprsquish</a>,
+          <a href="http://twitter.com/kevino" target="_blank">@kevino</a>,
+          <a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>,
+          <a href="http://twitter.com/timtrueman"
+          target="_blank">@timtrueman</a>,
+          <a href="http://twitter.com/wickman" target="_blank">@wickman</a>,
+          and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>;
+          Russian translation by
+          <a href="https://github.com/appigram">appigram</a>;
+          Chinese simple translation by
+          <a href="https://github.com/jasonqu">jasonqu</a>;
+          Korean translation by
+          <a href="https://github.com/enshahar">enshahar</a>;<br />
+          <br />
+
+          Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
           </p>
         </div>
       </div>

diff --git a/web/index.html b/web/index.html
@@ -11,7 +11,14 @@ <h1>Scala School!</h1>
       <!-- Example row of columns -->
       <div class="row">
         <div class="span8">
-          <p><b>Other Languages:</b> <a href="ru/index.html">Русский</a></b> <a href="zh_cn/index.html">简体中文</a></b></p>
+
+          <p><b>Other Languages:</b></p>
+
+          <ul style="list-style-type: none;">
+          <li><a href="ko/index.html">한국어</a>
+          <li><a href="ru/index.html">Русский</a>
+          <li><a href="zh_cn/index.html">简体中文</a></b>
+          </ul>
 
           <h2>About</h2>
           <p>Scala school started as a series of lectures at Twitter to prepare experienced engineers to be productive <a href="http://www.scala-lang.org/">Scala</a> programmers. Scala is a relatively new language, but draws on many familiar concepts. Thus, these lectures assumed the audience knew the concepts and showed how to use them in Scala. We found this an effective way of getting new engineers up to speed quickly. This is the written material that accompanied those lectures. We have found that these are useful in their own right.