diff --git a/_layouts/base.html b/_layouts/base.html
index b135c020..2c4a29e5 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -116,8 +116,8 @@ if(typeof(legacyIE)==='undefined'){
{% case page.lang %}
- {% when 'ar' or 'bg' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
-
+ {% when 'ar' or 'fa' %}
+
{% else %}
{% endcase %}
diff --git a/_plugins/translate.rb b/_plugins/translate.rb
index b67bbf00..7c713e77 100644
--- a/_plugins/translate.rb
+++ b/_plugins/translate.rb
@@ -63,6 +63,18 @@ module Jekyll
if ar.has_key?(id) && ar[id].is_a?(String)
text = ar[id]
end
+ #fallback to English if string is empty
+ if text == ''
+ lang = 'en'
+ ar = site['loc'][lang]
+ for key in keys do
+ break if !ar.is_a?(Hash) || !ar.has_key?(key) || !ar[key].is_a?(Hash)
+ ar = ar[key]
+ end
+ if ar.has_key?(id) && ar[id].is_a?(String)
+ text = ar[id]
+ end
+ end
#replace urls and anchors in string
url = site['loc'][lang]['url']
url.each do |key,value|
diff --git a/_templates/bitcoin-for-businesses.html b/_templates/bitcoin-for-businesses.html
index ef850dba..76a57a23 100755
--- a/_templates/bitcoin-for-businesses.html
+++ b/_templates/bitcoin-for-businesses.html
@@ -28,7 +28,8 @@ id: bitcoin-for-businesses
{% case page.lang %}
{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
+
{% else %}
-
+
{% endcase %}
diff --git a/_templates/bitcoin-for-developers.html b/_templates/bitcoin-for-developers.html
index 13a93f80..6e0dfaa5 100755
--- a/_templates/bitcoin-for-developers.html
+++ b/_templates/bitcoin-for-developers.html
@@ -23,9 +23,4 @@ id: bitcoin-for-developers
{% translate micro %}
{% translate microtext %}
-{% case page.lang %}
-{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
-{% else %}
-{% endcase %}
-
diff --git a/_templates/bitcoin-for-individuals.html b/_templates/bitcoin-for-individuals.html
index 16badbe0..867a30b9 100755
--- a/_templates/bitcoin-for-individuals.html
+++ b/_templates/bitcoin-for-individuals.html
@@ -25,6 +25,8 @@ id: bitcoin-for-individuals
{% case page.lang %}
{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
+
{% else %}
-
+
{% endcase %}
+
diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html
index ff413cb6..49b3e59b 100755
--- a/_templates/choose-your-wallet.html
+++ b/_templates/choose-your-wallet.html
@@ -29,9 +29,6 @@ id: choose-your-wallet
Bitcoin
Wallet
-{% case page.lang %}
-{% when 'ar' or 'bg' or 'de' or 'es' or 'fa' or 'fr' or 'hi' or 'hu' or 'id' or 'it' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'ru' or 'sv' or 'tr' or 'zh_CN' or 'zh_TW' %}
-{% else %}
-{% endcase %}
{% case page.lang %}
{% when 'ar' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
{% else %}
@@ -85,9 +81,6 @@ id: choose-your-wallet
MultiBit
-{% case page.lang %}
-{% when 'ar' or 'bg' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
-{% else %}
@@ -99,7 +92,6 @@ id: choose-your-wallet
Hive OS X
-{% endcase %}
@@ -259,9 +251,6 @@ id: choose-your-wallet
MultiBit
-{% case page.lang %}
-{% when 'ar' or 'bg' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
-{% else %}
@@ -275,7 +264,6 @@ id: choose-your-wallet
Hive OS X
-{% endcase %}
-{% case page.lang %}
-{% when 'ar' or 'bg' or 'de' or 'es' or 'fa' or 'fr' or 'hi' or 'hu' or 'id' or 'it' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'ru' or 'sv' or 'tr' or 'zh_CN' or 'zh_TW' %}
-{% else %}
-{% endcase %}
{% case page.lang %}
{% when 'ar' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
{% else %}
diff --git a/_templates/community.html b/_templates/community.html
index 4d82bedd..510c915c 100644
--- a/_templates/community.html
+++ b/_templates/community.html
@@ -54,7 +54,7 @@ id: community
{% case page.lang %}
{% when 'ar' or 'bg' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
-
{% translate nonprofit community en %}
+
{% translate nonprofit %}
{% else %}
{% endcase %}
diff --git a/_templates/development.html b/_templates/development.html
index bd915b83..68cf4353 100755
--- a/_templates/development.html
+++ b/_templates/development.html
@@ -3,11 +3,7 @@ layout: base
id: development
---
{% translate pagetitle %}
-{% case page.lang %}
-{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
-{% else %}
{% translate summary %}
-{% endcase %}
{% translate spec %}
{% translate spectxt %}
@@ -33,22 +29,15 @@ id: development
-{% case page.lang %}
-{% when 'ar' or 'fa' or 'id' or 'pl' or 'zh_TW' %}
-{% else %}
{% translate disclosure %}
bitcoin-security@lists.sourceforge.net
{% translate disclosuretxt %}
-{% endcase %}
{% translate involve %}
{% translate involvetxt1 %}
{% translate involvetxt2 %}
-{% case page.lang %}
-{% when 'ar' or 'fa' %}
-{% else %}
{% translate more %}
- Armory - A Bitcoin client with enhanced security features.
@@ -69,7 +58,6 @@ id: development
- sx - Modular Bitcoin commandline utilities.
- {% translate moremore %}
-{% endcase %}
{% translate contributors %}
diff --git a/_templates/download.html b/_templates/download.html
index 995b3813..e645261f 100755
--- a/_templates/download.html
+++ b/_templates/download.html
@@ -20,21 +20,12 @@ id: download
- {% case page.lang %}{% when 'ar' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}{% translate downloadsig download en %}{% else %}{% translate downloadsig %}{% endcase %}
- {% case page.lang %}
- {% when 'ar' or 'bg' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
- {% translate sourcecode download en %}
- {% else %}
+ {% translate downloadsig %}
{% translate sourcecode %}
- {% endcase %}
{% translate versionhistory %}
- {% case page.lang %}
- {% when 'ar' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
- {% else %}
{% translate patient %}
- {% endcase %}
{% translate notesync %}
{% translate notelicense %}
diff --git a/_templates/resources.html b/_templates/resources.html
index 98a7514f..7386f232 100644
--- a/_templates/resources.html
+++ b/_templates/resources.html
@@ -38,9 +38,6 @@ id: resources
Bitcoincharts.com
-{% case page.lang %}
-{% when 'ar' or 'fa' or 'id' or 'nl' or 'tr' or 'zh_TW' %}
-{% else %}
{% translate documentaries %}
@@ -51,5 +48,4 @@ id: resources
Khan Academy
-{% endcase %}
diff --git a/_templates/secure-your-wallet.html b/_templates/secure-your-wallet.html
index 3a134bf6..d2edabdc 100755
--- a/_templates/secure-your-wallet.html
+++ b/_templates/secure-your-wallet.html
@@ -8,12 +8,8 @@ id: secure-your-wallet
{% translate online %}
{% translate onlinetxt %}
-{% case page.lang %}
-{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
-{% else %}
{% translate everyday %}
{% translate everydaytxt %}
-{% endcase %}
{% translate backup %}
{% translate backuptxt %}
@@ -61,9 +57,6 @@ id: secure-your-wallet
{% translate offlinetxtxt5 %}
-{% case page.lang %}
-{% when 'ar' or 'fa' %}
-{% else %}
-{% endcase %}
-{% case page.lang %}
-{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
-{% else %}
{% translate update %}
{% translate updatetxt %}
-{% endcase %}
{% translate offlinemulti %}
{% translate offlinemultitxt %}
diff --git a/_templates/support-bitcoin.html b/_templates/support-bitcoin.html
index 768d4b46..9971f642 100755
--- a/_templates/support-bitcoin.html
+++ b/_templates/support-bitcoin.html
@@ -11,20 +11,12 @@ id: support-bitcoin
{% translate node %}
{% translate nodetxt %}
-{% case page.lang %}
-{% when 'ar' or 'bg' or 'fa' or 'id' or 'nl' or 'pl' or 'tr' or 'zh_TW' %}
-{% else %}
{% translate mining %}
{% translate miningtxt %}
-{% endcase %}
{% translate translate %}
{% translate translatetxt %}
-{% case page.lang %}
-{% when 'ar' %}
-{% else %}
Bitcoin Core - Bitcoin.org - Bitcoin Wiki - Bitcoin Wallet (Android) - MultiBit - Electrum - Hive
-{% endcase %}
{% translate develop %}
{% translate developtxt %}
@@ -33,7 +25,6 @@ id: support-bitcoin
{% translate donationtxt %}
{% case page.lang %}
-{% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
{% when 'bg' or 'id' or 'nl' or 'tr' %}
{% translate foundation %}
{% translate foundationtxt %}
diff --git a/_templates/you-need-to-know.html b/_templates/you-need-to-know.html
index 0c4d5d67..8f618bc5 100755
--- a/_templates/you-need-to-know.html
+++ b/_templates/you-need-to-know.html
@@ -35,12 +35,8 @@ id: you-need-to-know
{% translate anonymous %}
{% translate anonymoustxt %}
-{% case page.lang %}
-{% when 'ar' or 'fa' %}
-{% else %}
{% translate instant %}
{% translate instanttxt %}
-{% endcase %}
{% translate experimental %}
{% translate experimentaltxt %}