Improved localisation

HazzaAlkaabi · Jun 19, 2017 · 188a532 · 188a532
1 parent e0c7d43
commit 188a532
Show file tree

Hide file tree

Showing 15 changed files with 630 additions and 104 deletions.
diff --git a/core/book.rb b/core/book.rb
@@ -65,7 +65,7 @@ def add_page page
 
   end
 
-  def build
+  def build lang
 
     puts "Generating.."
 
@@ -81,11 +81,11 @@ def build
     end
 
     # Create file
-    out_file = File.new("thousand.#{$lang}.html", "w")
-    out_file.puts("<html><meta charset='UTF-8'><body class='lang_#{$lang}'>#{content}</body></html>")
+    out_file = File.new("thousand.#{lang}.html", "w")
+    out_file.puts("<html><meta charset='UTF-8'><body class='lang_#{lang}'>#{content}</body></html>")
     out_file.close
 
-    puts "Completed #{count} pages, for thousand.#{$lang}.html"
+    puts "Completed #{count} pages, for thousand.#{lang}.html"
     puts "Word count: #{$word_cound}"
 
   end

diff --git a/core/pages/thank.rb b/core/pages/thank.rb
@@ -16,19 +16,27 @@ def initialize loc_text = nil, story
     @style = {}
     @style["p"] = "padding:40px; font-size:26px; line-height:36px"
     @style["h1"] = "font-weight: normal;text-transform: uppercase;display: block;text-align: center;font-size: 36px;margin-top: 120px;margin-bottom: 40px"
+    @style["list"] = "display:block"
+    @style["list li"] = "display:block; font-size:20px; line-height:30px"
+    @style["list li span.left"] = " width: calc(50% - 15px);display: inline-block;text-align: right;margin-right: 15px"
+    @style["list li span.right"] = " width: calc(50% - 15px);display: inline-block;text-align: left;margin-left: 15px"
 
+    body = ""
     story.each do |lang,content|
-      p "#{content[:language]} -> #{content[:translator]}"
+      if lang == :en then next end
+      if lang == :fr then next end
+      if lang == :li then next end
+      body += "<li><span class='left'>#{content[:language]}</span><span class='right'>#{content[:translator]}</span></li>"
     end
 
     @thanks = loc_text
-    @names = "" # body
+    @names = body
 
   end
 
   def content
 
-    return "<h1>#{@thanks}</h1><p>#{@names}</p>"
+    return "<h1>#{@thanks}</h1><list>#{@names}</list>"
 
   end
 

diff --git a/lang.de.rb b/lang.de.rb
@@ -1,7 +1,7 @@
 # Contact : 
 
 $lang_de = {
-  :translator => "Max H<trema>a</trema>ßlein",
+  :translator => "Max Haßlein",
   :language => "German",
   :title => "Tausend R<trema>a</trema>ume",
   :title_page => [

diff --git a/main.rb b/main.rb
@@ -40,63 +40,67 @@
 $story[:ch] = $lang_ch
 $story[:ar] = $lang_ar
 
-target_story = $story[$lang]
-
-book = Book.new(target_story[:title])
-book.add_page(CoverPage.new(target_story[:title]))
-book.add_page(BlankPage.new)
-book.add_page(TitlePage.new(target_story[:title_page]))
-book.add_page(BlankPage.new)
-book.add_page(PrefacePage.new(target_story[:preface]))
-book.add_page(BlankPage.new)
-book.add_page(ChapterPage.new(1,target_story[:lesson1][0]))
-book.add_page(IllustrationPage.new("cat.1",target_story[:lesson1][1]))
-book.add_page(IllustrationPage.new("owl.1",target_story[:lesson1][2]))
-book.add_page(IllustrationPage.new("bat.1",target_story[:lesson1][3]))
-book.add_page(IllustrationPage.new("fox.1",target_story[:lesson1][4]))
-book.add_page(BlankPage.new)
-
-book.add_page(ChapterPage.new(2,target_story[:lesson2][0]))
-book.add_page(IllustrationPage.new("cat.2",target_story[:lesson2][1]))
-book.add_page(IllustrationPage.new("owl.2",target_story[:lesson2][2]))
-book.add_page(IllustrationPage.new("bat.2",target_story[:lesson2][3]))
-book.add_page(IllustrationPage.new("fox.2",target_story[:lesson2][4]))
-book.add_page(BlankPage.new)
-
-book.add_page(ChapterPage.new(3,target_story[:lesson3][0]))
-book.add_page(IllustrationPage.new("cat.3",target_story[:lesson3][1]))
-book.add_page(IllustrationPage.new("owl.3",target_story[:lesson3][2]))
-book.add_page(IllustrationPage.new("bat.3",target_story[:lesson3][3]))
-book.add_page(IllustrationPage.new("fox.3",target_story[:lesson3][4]))
-book.add_page(BlankPage.new)
-
-book.add_page(ChapterPage.new(4,target_story[:lesson4][0]))
-book.add_page(IllustrationPage.new("cat.4",target_story[:lesson4][1]))
-book.add_page(IllustrationPage.new("owl.4",target_story[:lesson4][2]))
-book.add_page(IllustrationPage.new("bat.4",target_story[:lesson4][3]))
-book.add_page(IllustrationPage.new("fox.4",target_story[:lesson4][4]))
-book.add_page(BlankPage.new)
-
-book.add_page(ChapterPage.new(5,target_story[:lesson5][0]))
-book.add_page(IllustrationPage.new("cat.5",target_story[:lesson5][1]))
-book.add_page(IllustrationPage.new("owl.5",target_story[:lesson5][2]))
-book.add_page(IllustrationPage.new("bat.5",target_story[:lesson5][3]))
-book.add_page(IllustrationPage.new("fox.5",target_story[:lesson5][4]))
-book.add_page(BlankPage.new)
-
-book.add_page(ChapterPage.new(6,target_story[:lesson6][0]))
-book.add_page(IllustrationPage.new("cat.6",target_story[:lesson6][1]))
-book.add_page(IllustrationPage.new("owl.6",target_story[:lesson6][2]))
-book.add_page(IllustrationPage.new("bat.6",target_story[:lesson6][3]))
-book.add_page(IllustrationPage.new("fox.6",target_story[:lesson6][4]))
-book.add_page(BlankPage.new)
-
-book.add_page(ChapterPage.new(7,target_story[:lesson7][0]))
-book.add_page(BlankPage.new)
-book.add_page(IllustrationPage.new("you.1",target_story[:lesson7][1]))
-book.add_page(BlankPage.new)
-
-book.add_page(ThankPage.new(target_story[:thanks],$story))
-book.add_page(BlankPage.new)
-
-book.build
+$story.each do |lang,story|
+
+  target_story = $story[lang]
+
+  book = Book.new(target_story[:title])
+  book.add_page(CoverPage.new(target_story[:title]))
+  book.add_page(BlankPage.new)
+  book.add_page(TitlePage.new(target_story[:title_page]))
+  book.add_page(BlankPage.new)
+  book.add_page(PrefacePage.new(target_story[:preface]))
+  book.add_page(BlankPage.new)
+  book.add_page(ChapterPage.new(1,target_story[:lesson1][0]))
+  book.add_page(IllustrationPage.new("cat.1",target_story[:lesson1][1]))
+  book.add_page(IllustrationPage.new("owl.1",target_story[:lesson1][2]))
+  book.add_page(IllustrationPage.new("bat.1",target_story[:lesson1][3]))
+  book.add_page(IllustrationPage.new("fox.1",target_story[:lesson1][4]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ChapterPage.new(2,target_story[:lesson2][0]))
+  book.add_page(IllustrationPage.new("cat.2",target_story[:lesson2][1]))
+  book.add_page(IllustrationPage.new("owl.2",target_story[:lesson2][2]))
+  book.add_page(IllustrationPage.new("bat.2",target_story[:lesson2][3]))
+  book.add_page(IllustrationPage.new("fox.2",target_story[:lesson2][4]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ChapterPage.new(3,target_story[:lesson3][0]))
+  book.add_page(IllustrationPage.new("cat.3",target_story[:lesson3][1]))
+  book.add_page(IllustrationPage.new("owl.3",target_story[:lesson3][2]))
+  book.add_page(IllustrationPage.new("bat.3",target_story[:lesson3][3]))
+  book.add_page(IllustrationPage.new("fox.3",target_story[:lesson3][4]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ChapterPage.new(4,target_story[:lesson4][0]))
+  book.add_page(IllustrationPage.new("cat.4",target_story[:lesson4][1]))
+  book.add_page(IllustrationPage.new("owl.4",target_story[:lesson4][2]))
+  book.add_page(IllustrationPage.new("bat.4",target_story[:lesson4][3]))
+  book.add_page(IllustrationPage.new("fox.4",target_story[:lesson4][4]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ChapterPage.new(5,target_story[:lesson5][0]))
+  book.add_page(IllustrationPage.new("cat.5",target_story[:lesson5][1]))
+  book.add_page(IllustrationPage.new("owl.5",target_story[:lesson5][2]))
+  book.add_page(IllustrationPage.new("bat.5",target_story[:lesson5][3]))
+  book.add_page(IllustrationPage.new("fox.5",target_story[:lesson5][4]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ChapterPage.new(6,target_story[:lesson6][0]))
+  book.add_page(IllustrationPage.new("cat.6",target_story[:lesson6][1]))
+  book.add_page(IllustrationPage.new("owl.6",target_story[:lesson6][2]))
+  book.add_page(IllustrationPage.new("bat.6",target_story[:lesson6][3]))
+  book.add_page(IllustrationPage.new("fox.6",target_story[:lesson6][4]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ChapterPage.new(7,target_story[:lesson7][0]))
+  book.add_page(BlankPage.new)
+  book.add_page(IllustrationPage.new("you.1",target_story[:lesson7][1]))
+  book.add_page(BlankPage.new)
+
+  book.add_page(ThankPage.new(target_story[:thanks],$story))
+  book.add_page(BlankPage.new)
+
+  book.build(lang)
+
+end
diff --git a/thousand.ar.html b/thousand.ar.html
@@ -11,13 +11,28 @@
   page cedil { display:inline; background-image:url(assets/accent.cedil.svg); background-position:center 0px}
   page trema { display: inline-block;background-position: center 0px;height: 15.5px;}
   page trema:before { background-color:white; display: inline-block;width: 15px;height: 15px;content: ' ';position: absolute; background-image: url(assets/accent.trema.svg); }
+<<<<<<< HEAD
+  body.lang_el { font-family: 'Jura', sans-serif; }
+  body.lang_ru h1 { letter-spacing:-12px}
+  body.lang_el h1 { letter-spacing:-2px}
+  body.lang_ru .cover h1 { letter-spacing:-8px}
+  body.lang_el .cover h1 { letter-spacing:-2px}
+  body.lang_ru .title h1 { letter-spacing:-8px}
+  body.lang_el .preface p {letter-spacing:-2px}
+  body.lang_ru .preface p {letter-spacing:-6px}
+  body.lang_el .illustration h1 { letter-spacing:-2px}
+  body.lang_ru .thank p {letter-spacing:-6px}
+  body.lang_el .thank p {letter-spacing:-2px}
+  body.lang_ar { font-family: 'KufiStandardGK', 'Jura', Tahoma !important; }
+=======
   body.lang_el { font-family: 'Yuanti TC', sans-serif; }
   body.lang_ru h1 { letter-spacing:-12px}
   body.lang_ru .cover h1 { letter-spacing:-8px}
   body.lang_ru .title h1 { letter-spacing:-8px}
   body.lang_ru .preface p {letter-spacing:-6px}
   body.lang_ru .thank p {letter-spacing:-6px}
   body.lang_ar { font-family: 'Jura', Tahoma !important; }
+>>>>>>> upstream/master
     page.cover  { background:white; overflow:hidden }
   page.cover img { width:100% }
   page.cover h1 { position:absolute; bottom:100px; color:black; text-transform:uppercase; width:100%; text-align:center; font-weight:normal; font-size:36px }
@@ -44,6 +59,10 @@
   page.illustration h1 trema:before { top:10px }
   page.thank p { padding:40px; font-size:26px; line-height:36px }
   page.thank h1 { font-weight: normal;text-transform: uppercase;display: block;text-align: center;font-size: 36px;margin-top: 120px;margin-bottom: 40px }
+  page.thank list { display:block }
+  page.thank list li { display:block; font-size:20px; line-height:30px }
+  page.thank list li span.left {  width: calc(50% - 15px);display: inline-block;text-align: right;margin-right: 15px }
+  page.thank list li span.right {  width: calc(50% - 15px);display: inline-block;text-align: left;margin-left: 15px }
 </style>
 
 <page class='cover'>
@@ -262,7 +281,7 @@ <h1>ماذا كنت ستفعل؟</h1>
 </page>
 
 <page class='thank'>
-  <h1>شكراً</h1><p>.جنجر ليه لردودها الإبداعية، آر ايه لمساعدته في الترجمة الروسية، تشيس ويوكا للترجمة اليابانية، ماكس هيسلاين للترجمة الألمانية وبعض الأصدقاء في مونتريال لمنح أفكارهم</p>
+  <h1>شكراً</h1><list><li><span class='left'>Russian</span><span class='right'>RA</span></li><li><span class='left'>Japanese</span><span class='right'>Chase & Yuka</span></li><li><span class='left'>German</span><span class='right'>Max Haßlein</span></li><li><span class='left'>Italian</span><span class='right'>Federico Salvador</span></li><li><span class='left'>Dutch</span><span class='right'>Vincent</span></li><li><span class='left'>Greek</span><span class='right'>Paris K.</span></li><li><span class='left'>Chinese</span><span class='right'>Humble Ray</span></li><li><span class='left'>Arabic</span><span class='right'>Hazza Alkaabi</span></li></list>
 </page>
 
 <page class='blank'>