From 756709952c1f147f9d6468e9a24a179f10032d15 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 13 Dec 2020 03:38:44 +0900
Subject: [PATCH 1/5] Add Santali

---
 data/languages.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/languages.yaml b/data/languages.yaml
index 0bd285a..e4eab9f 100644
--- a/data/languages.yaml
+++ b/data/languages.yaml
@@ -24,6 +24,7 @@ pl: Polski
 pt: Português
 ro: Română
 ru: Русский
+sat: ᱥᱟᱱᱛᱟᱲᱤ
 si: සිංහල
 sr: Српски
 sv: Svenska

From 50e5dbca3b6013e1de634ced89c4736af2ab7d91 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 13 Dec 2020 03:39:10 +0900
Subject: [PATCH 2/5] Define deploy task

---
 Rakefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index bad1eed..5b2d568 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,7 +24,7 @@ end
 task :default => [:build_trans, :build_site]
 
 desc "Build site"
-multitask :build_site => [:build_base, "crowdin:download"] do
+task :build_site => [:build_base, "crowdin:download"] do
   Pathname.glob("#{LOCALE_DIR}/**/*.html").select(&:file?).each do |path|
     content = path.read
     content.sub! /<script type="text\/javascript" src="\/\/cdn.crowdin.com\/jipt\/jipt.js"><\/script>/, ""
@@ -56,9 +56,14 @@ task :build_trans_src do
   sh "middleman", "build", "--build-dir", LOCALE_DIR
 end
 
+desc "Deploy joinplue.me"
+task :deploy => :build_site do
+  sh "netlify", "deploy", "--site", "12885026-8536-4072-b216-04d71e8f84be", "--dir", BUILD_DIR, "--prod"
+end
+
 desc "Deploy translate.joinplu.me"
 task :deploy_trans => :build_trans do
-  sh "netlify", "deploy", "--dir", TRANS_DIR, "--prod"
+  sh "netlify", "deploy", "--site", "0812f781-8b3a-481d-b4fb-bc5cb5254f19", "--dir", TRANS_DIR, "--prod"
 end
 
 namespace :crowdin do
@@ -73,6 +78,6 @@ namespace :crowdin do
   end
 
   task :download_pseudo do
-    sh "crowdin", "download", "--language", PSEUDO_LANG
+    sh "crowdin", "download", "--pseudo"
   end
 end

From 65f66f95f9aea4b1304cf4b6e569e18877282a1b Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sat, 2 Jan 2021 08:51:34 +0900
Subject: [PATCH 3/5] Add Webrick to dependencies for Ruby 3.0

---
 Gemfile      | 1 +
 Gemfile.lock | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 184a0f4..4dbe5bc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,3 +5,4 @@ gem 'middleman-autoprefixer', '~> 2.7'
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
 gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw]
 gem 'rake'
+gem 'webrick'
diff --git a/Gemfile.lock b/Gemfile.lock
index a81d376..5c64d97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,6 +97,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
@@ -107,6 +108,7 @@ DEPENDENCIES
   rake
   tzinfo-data
   wdm (~> 0.1)
+  webrick
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

From 521ea1b9ec754937331879439f393f51a849df9c Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sat, 2 Jan 2021 09:01:04 +0900
Subject: [PATCH 4/5] Update set up document

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ab1c74f..0588a4c 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,12 @@ It is using middleman.
 - `netlify` command v2
 - Environment variable `NETLIFY_AUTH_TOKEN`
 
+### Ruby
+
+- Execute `bundle install --path=vendor/bundle` at first
+
 ## Usefull commands
 
-- `middleman` for live preview during development
+- `bundle exec middleman` for live preview during development
 - `bundle exec rake build_site` when deploying
 - `bundle exec rake deploy_trans` when deploying https://translate.joinplu.me/

From e75dea6a11096878ff3938ad9f17f3c52bc04731 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sat, 2 Jan 2021 09:01:14 +0900
Subject: [PATCH 5/5] Change Matrix room URI

---
 source/_nav.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_nav.erb b/source/_nav.erb
index c4b3f7b..04c27be 100644
--- a/source/_nav.erb
+++ b/source/_nav.erb
@@ -10,7 +10,7 @@
        <a href="https://github.com/Plume-org/Plume">Source code</a>
     </li>
     <li>
-       <a href="https://riot.im/app/#/room/#plume:disroot.org">Chat room</a>
+       <a href="https://matrix.to/#/#plume-blog:matrix.org">Chat room</a>
     </li>
     <li>
        <a href="https://fediverse.blog/~/PlumeDev">Updates</a>