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: twitter/effectivescala
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: dogfeet/effectivescala
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ko
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 5 commits
  • 8 files changed
  • 3 contributors

Commits on Sep 27, 2012

  1. [ko] copy from en

    @lethee
    lethee committed Sep 27, 2012
    Copy the full SHA
    8c78430 View commit details

  2. [ko] copy from en

    @pismute
    pismute committed Sep 27, 2012
    Copy the full SHA
    5ce94c3 View commit details

  3. publish by lethee

    @lethee @pismute
    lethee authored and pismute committed Sep 27, 2012
    Copy the full SHA
    1b58ad1 View commit details

  4. [ko] some modification 

    Conflicts:

	effectivescala-cn.mo
	effectivescala-ja.mo
	effectivescala-ko.mo
	effectivescala-ru.mo
	effectivescala.mo
    @lethee @pismute
    lethee authored and pismute committed Sep 27, 2012
    Copy the full SHA
    7060c86 View commit details

  5. [ko] Add footer

    @pismute
    pismute committed Sep 27, 2012
    Copy the full SHA
    70d214d View commit details
Showing with 1,834 additions and 3 deletions.
  1. +5 −2 Makefile
  2. +1 −0 effectivescala-cn.mo
  3. +1 −0 effectivescala-ja.mo
  4. +1,701 −0 effectivescala-ko.mo
  5. +1 −0 effectivescala-ru.mo
  6. +1 −1 effectivescala.mo
  7. +11 −0 footer-ko.html.inc
  8. +113 −0 header-ko.html.inc
7 changes: 5 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#MARKDOWN = $(HOME)/Library/Haskell/bin/pandoc -f markdown -t html
MARKDOWN = peg-markdown --smart --notes

all: index.html index-ja.html index-ru.html index-cn.html
all: index.html index-ja.html index-ru.html index-cn.html index-ko.html

index.html: header.html.inc effectivescala.html footer.html.inc
cat $^ > $@
@@ -15,8 +15,11 @@ index-ru.html: header-ru.html.inc effectivescala-ru.html footer-ru.html.inc
index-cn.html: header-cn.html.inc effectivescala-cn.html footer-cn.html.inc
cat $^ > $@

index-ko.html: header.html.inc effectivescala-ko.html footer-ko.html.inc
cat $^ > $@

pub: all
./publish.sh index.html index-ja.html index-ru.html index-cn.html coll.png
./publish.sh index.html index-ja.html index-ru.html index-cn.html index-ko.html coll.png

%.html: %.mo
cat $< | bash proc.sh | bash toc.sh | bash fmt.sh | $(MARKDOWN) > $@
1 change: 1 addition & 0 deletions effectivescala-cn.mo
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
<a href="index.html">English</a>
<a href="index-ja.html">日本語</a>
<a href="index-ru.html">Русский</a>
<a href="index-ko.html">한국어</a>

## 序言

1 change: 1 addition & 0 deletions effectivescala-ja.mo
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
<a href="index.html">English</a>
<a href="index-ru.html">Русский</a>
<a href="index-cn.html">简体中文</a>
<a href="index-ko.html">한국어</a>

## 序章

Loading