From f8ebf1e0d35b8ec3936f169ead1f9038a4d38462 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:12:53 +0200
Subject: [PATCH 1/9] Create .travix.yml

---
 .travix.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .travix.yml

diff --git a/.travix.yml b/.travix.yml
new file mode 100644
index 0000000..42469bd
--- /dev/null
+++ b/.travix.yml
@@ -0,0 +1,7 @@
+language: python
+python:
+  - "3.5"
+install:
+  - pip3 install -r requirements.txt
+script:
+  python3.5 'Calendar/E-Paper.py'

From e3f6d2175ce061c1382ea4fbe8a285d846cf5fa8 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:13:30 +0200
Subject: [PATCH 2/9] Create requirements.txt

---
 requirements.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..87186c4
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+pyowm
+Pillow==5.3.0
+ics
+feedparser

From 2ed573e51b4399725a7d20e484bdeb972247edb5 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:14:24 +0200
Subject: [PATCH 3/9] Create settings.py

---
 Calendar/settings.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Calendar/settings.py

diff --git a/Calendar/settings.py b/Calendar/settings.py
new file mode 100644
index 0000000..e343820
--- /dev/null
+++ b/Calendar/settings.py
@@ -0,0 +1,15 @@
+ical_urls = ["https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics"]
+rss_feeds = ["http://feeds.bbci.co.uk/news/world/rss.xml#"]
+update_interval = "60"
+api_key = ""
+location = "Stuttgart, DE"
+week_starts_on = "Monday"
+events_max_range = "60"
+calibration_hours = [0,12,18]
+display_colours = "bwr"
+language = "en"
+units = "metric"
+hours = "24"
+top_section = "Weather"
+middle_section = "Agenda"
+bottom_section = "RSS"

From 0036f0ea920c59848a4a3a18c07695871bdb1067 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:25:54 +0200
Subject: [PATCH 4/9] Delete requirements.txt

---
 requirements.txt | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 87186c4..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pyowm
-Pillow==5.3.0
-ics
-feedparser

From 6aaec0b7d1320a30cdc50a841e379f2ba199208d Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:26:02 +0200
Subject: [PATCH 5/9] Delete .travix.yml

---
 .travix.yml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .travix.yml

diff --git a/.travix.yml b/.travix.yml
deleted file mode 100644
index 42469bd..0000000
--- a/.travix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: python
-python:
-  - "3.5"
-install:
-  - pip3 install -r requirements.txt
-script:
-  python3.5 'Calendar/E-Paper.py'

From 553d5e915c1baa1d6c057fc1cd0aedd30f39881e Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:26:12 +0200
Subject: [PATCH 6/9] Delete settings.py

---
 Calendar/settings.py | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 Calendar/settings.py

diff --git a/Calendar/settings.py b/Calendar/settings.py
deleted file mode 100644
index e343820..0000000
--- a/Calendar/settings.py
+++ /dev/null
@@ -1,15 +0,0 @@
-ical_urls = ["https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics"]
-rss_feeds = ["http://feeds.bbci.co.uk/news/world/rss.xml#"]
-update_interval = "60"
-api_key = ""
-location = "Stuttgart, DE"
-week_starts_on = "Monday"
-events_max_range = "60"
-calibration_hours = [0,12,18]
-display_colours = "bwr"
-language = "en"
-units = "metric"
-hours = "24"
-top_section = "Weather"
-middle_section = "Agenda"
-bottom_section = "RSS"

From 1956f0dcd30f5dbc27df25a16fe7005264f67922 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:34:06 +0200
Subject: [PATCH 7/9] Added support for more languages

With this update, support for chinese, taiwanese-chinese, japanese and korean language has been added.
---
 Calendar/Settings-Web-UI.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Calendar/Settings-Web-UI.html b/Calendar/Settings-Web-UI.html
index d4fbca8..89dd94b 100644
--- a/Calendar/Settings-Web-UI.html
+++ b/Calendar/Settings-Web-UI.html
@@ -187,6 +187,22 @@ body{
             <input id="language_vi" type="radio" name="la">
             <label for="language_vi">Vietnamese</label>
           </div>
+          <div class="ts radio checkbox">
+            <input id="language_zh_tw" type="radio" name="la">
+            <label for="language_zh_tw">Chinese-Taiwanese</label>
+          </div>
+          <div class="ts radio checkbox">
+            <input id="language_zh" type="radio" name="la">
+            <label for="language_zh">Chinese</label>
+          </div>
+          <div class="ts radio checkbox">
+            <input id="language_ja" type="radio" name="la">
+            <label for="language_ja">Japanese</label>
+          </div>
+          <div class="ts radio checkbox">
+            <input id="language_ko" type="radio" name="la">
+            <label for="language_ko">Korean</label>
+          </div>
         </div>
       </div>
 
@@ -384,6 +400,18 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     if ($('#language_vi').is(':checked')){
       language = "vi";
     }
+    if ($('#language_zh_tw').is(':checked')){
+      language = "zh_tw";
+    }
+    if ($('#language_zh').is(':checked')){
+      language = "zh";
+    }
+    if ($('#language_ja').is(':checked')){
+      language = "ja";
+    }
+    if ($('#language_ko').is(':checked')){
+      language = "ko";
+    }
 
     var units = "metric";
     if ($('#imperial').is(':checked')){

From e3e07b5c51c40a23338dd818f7709f6281b67fab Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Mon, 13 May 2019 13:36:13 +0200
Subject: [PATCH 8/9] Added support for cjk

This updates allows choosing chinese, japanese and korean as a language
---
 Calendar/E-Paper.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Calendar/E-Paper.py b/Calendar/E-Paper.py
index 74467eb..5c12e50 100644
--- a/Calendar/E-Paper.py
+++ b/Calendar/E-Paper.py
@@ -39,10 +39,16 @@ from calibration import calibration
 EPD_WIDTH = 640
 EPD_HEIGHT = 384
 
-default = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedLight.ttf', 18)
-semi = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensed.ttf', 18)
-bold = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedMedium.ttf', 18)
-month_font = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedLight.ttf', 40)
+if language in ['ja','zh','zh_tw','ko']:
+    default = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-Light.otf', 18)
+    semi = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-DemiLight.otf', 18)
+    bold = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-Regular.otf', 18)
+    month_font = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-DemiLight.otf', 40)
+else:
+    default = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedLight.ttf', 18)
+    semi = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensed.ttf', 18)
+    bold = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedMedium.ttf', 18)
+    month_font = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedLight.ttf', 40)
 
 im_open = Image.open
 

From 5022a28747c2a625828f6b0aefbdde792ec1488e Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Tue, 14 May 2019 20:17:47 +0200
Subject: [PATCH 9/9] Fixed typo for top-section

---
 Calendar/Settings-Web-UI.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Calendar/Settings-Web-UI.html b/Calendar/Settings-Web-UI.html
index 89dd94b..c452673 100644
--- a/Calendar/Settings-Web-UI.html
+++ b/Calendar/Settings-Web-UI.html
@@ -239,7 +239,7 @@ body{
         <div class="ts checkboxes">
           <div class="ts radio checkbox">
             <input id="Weather" type="radio" name="ts" checked>
-            <label for="Weather">Events from my iCalendar</label>
+            <label for="Weather">Weather</label>
           </div>
           <div class="ts radio checkbox">
             <input id="top_blank" type="radio" name="ts">