Bitcoin Core: Remove Basic Translation

bitcoin-dot-org · Sep 14, 2015 · 9b47198 · 9b47198
1 parent 8bd0422
commit 9b47198
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 234 deletions.
diff --git a/_includes/bitcoin-core/download-bitcoin-core.html b/_includes/bitcoin-core/download-bitcoin-core.html
@@ -4,7 +4,7 @@
 {% endcomment %}
 
 <div class="callout">
-<p><a href="/{{page.lang}}/{% translate download url %}">{% translate download-bitcoin-core bitcoin-core-overview %}</a>
+<p><a href="/{{page.lang}}/{% translate download url %}">Download Bitcoin Core</a>
   <img src="/img/os/windows.png" alt="Windows">
   <img src="/img/os/mac.png" alt="Mac">
   <img src="/img/os/linux.png" alt="Linux">

diff --git a/_includes/layout/base-core/head-logo.html b/_includes/layout/base-core/head-logo.html
@@ -3,4 +3,4 @@
 http://opensource.org/licenses/MIT.
 {% endcomment %}
 
-<a class="logo" href="/{{page.lang}}/{% translate bitcoin-core-overview url %}"><img src="/img/bitcoin-core/bitcoin-core.svg" alt="Bitcoin"></a>
+<a class="logo" href="/en/bitcoin-core/"><img src="/img/bitcoin-core/bitcoin-core.svg" alt="Bitcoin"></a>
diff --git a/_includes/layout/base-core/head-menu.html b/_includes/layout/base-core/head-menu.html
@@ -4,26 +4,26 @@
 {% endcomment %}
 
 <ul id="menusimple" class="menusimple menucore" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
-  <li><a>{% translate menu-bcc-features layout %}</a>
+  <li><a>Features</a>
     <ul>
-      <li{% if page.id == 'bitcoin-core-feature-overview' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-features url %}">{% translate menu-bcc-features-overview layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-validation' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-validation url %}">{% translate menu-bcc-validation layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-privacy' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-privacy url %}">{% translate menu-bcc-privacy layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-requirements' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-requirements url %}">{% translate menu-bcc-requirements layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-user-interface' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-user-interface url %}">{% translate menu-bcc-user-interface layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-donate-bandwidth' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-network-support url %}">{% translate menu-bcc-network-support layout %}</a></li>
+      <li{% if page.id == 'bitcoin-core-feature-overview' %} class="active"{% endif %}><a href="/en/bitcoin-core/features/">Overview</a></li>
+      <li{% if page.id == 'bitcoin-core-validation' %} class="active"{% endif %}><a href="/en/bitcoin-core/features/validation">Validation</a></li>
+      <li{% if page.id == 'bitcoin-core-privacy' %} class="active"{% endif %}><a href="/en/bitcoin-core/features/privacy">Privacy</a></li>
+      <li{% if page.id == 'bitcoin-core-requirements' %} class="active"{% endif %}><a href="/en/bitcoin-core/features/requirements">Requirements</a></li>
+      <li{% if page.id == 'bitcoin-core-user-interface' %} class="active"{% endif %}><a href="/en/bitcoin-core/features/user-interface">User Interface</a></li>
+      <li{% if page.id == 'bitcoin-core-donate-bandwidth' %} class="active"{% endif %}><a href="/en/bitcoin-core/features/network-support">Network Support</a></li>
     </ul>
   </li>
-  <li{% if page.id == 'bitcoin-core-help' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-help url %}">{% translate menu-bcc-help layout %}</a></li>
-  <li{% if page.id == 'bitcoin-core-contribute' %} class="active"{% endif %}><a>{% translate menu-bcc-contribute layout %}</a>
+  <li{% if page.id == 'bitcoin-core-help' %} class="active"{% endif %}><a href="/en/bitcoin-core/help">Get Help</a></li>
+  <li{% if page.id == 'bitcoin-core-contribute' %} class="active"{% endif %}><a>Contribute</a>
     <ul>
-      <li{% if page.id == 'bitcoin-core-contribute-issues' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-issues url %}">{% translate menu-bcc-contribute-issues layout %}</a></li>
-      <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate development url %}">{% translate menu-bcc-contribute-code layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-contribute-documentation' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-documentation url %}">{% translate menu-bcc-contribute-documentation layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-contribute-translations' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-translations url %}">{% translate menu-bcc-contribute-translations layout %}</a></li>
-      <li{% if page.id == 'bitcoin-core-contribute-tech-support' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-tech-support url %}">{% translate menu-bcc-contribute-tech-support layout %}</a></li>
+      <li{% if page.id == 'bitcoin-core-contribute-issues' %} class="active"{% endif %}><a href="/en/bitcoin-core/contribute/issues">Bug reports</a></li>
+      <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate development url %}">Code</a></li>
+      <li{% if page.id == 'bitcoin-core-contribute-documentation' %} class="active"{% endif %}><a href="/en/bitcoin-core/contribute/documentation">Documentation</a></li>
+      <li{% if page.id == 'bitcoin-core-contribute-translations' %} class="active"{% endif %}><a href="/en/bitcoin-core/contribute/translations">Translations</a></li>
+      <li{% if page.id == 'bitcoin-core-contribute-tech-support' %} class="active"{% endif %}><a href="/en/bitcoin-core/contribute/support">Tech Support</a></li>
     </ul>
   </li>
-  <li{% if page.id == 'version-history' %} class="active"{% endif %}><a href="/en/version-history">{% translate menu-bcc-news layout %}</a></li>
-  <li{% if page.id == 'download' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate download url %}">{% translate menu-bcc-download layout %}</a></li>
+  <li{% if page.id == 'version-history' %} class="active"{% endif %}><a href="/en/version-history">News</a></li>
+  <li{% if page.id == 'download' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate download url %}">Download</a></li>
 </ul>
diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html
@@ -21,12 +21,11 @@
       {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
       <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
       <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
-      {% case page.lang %}
-      {% when 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %}
-        <li{% if page.id == 'download' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate download url %}">{% translate bitcoin-core layout %}</a></li>
+      {% if page.lang == 'en' %}
+        <li><a href="/en/bitcoin-core/">{% translate bitcoin-core layout %}</a></li>
       {% else %}
-        <li><a href="/{{page.lang}}/{% translate bitcoin-core-overview url %}">{% translate bitcoin-core layout %}</a></li>
-      {% endcase %}
+        <li{% if page.id == 'download' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate download url %}">{% translate bitcoin-core layout %}</a></li>
+      {% endif %}
     </ul>
   </li>
   <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>

diff --git a/_includes/references.md b/_includes/references.md
@@ -181,30 +181,30 @@ http://opensource.org/licenses/MIT.
 
 {% comment %}<!-- Other internal site links; alphabetical order -->{% endcomment %}
 [bandwidth sharing guide]: /en/full-node
-[bcc contribute]: /{{page.lang}}/{% translate bitcoin-core-contribute url %}
+[bcc contribute]: /en/bitcoin-core/contribute/
 [bcc contribute code]: /{{page.lang}}/{% translate development url %}
-[bcc contribute documentation]: /{{page.lang}}/{% translate bitcoin-core-contribute-documentation url %}
-[bcc contribute issues]: /{{page.lang}}/{% translate bitcoin-core-contribute-issues url %}
-[bcc contribute support]: /{{page.lang}}/{% translate bitcoin-core-contribute-tech-support url %}
-[bcc contribute translations]: /{{page.lang}}/{% translate bitcoin-core-contribute-translations url %}
-[bcc decentralized peer discovery]: /{{page.lang}}/{% translate bitcoin-core-privacy url %}#decentralized-peer-discovery
-[bcc documentation]: /{{page.lang}}/{% translate bitcoin-core-help url %}#documentation
-[bcc download]: /{{page.lang}}/{% translate download url %}
-[bcc features]: /{{page.lang}}/{% translate bitcoin-core-features url %}
-[bcc forums]: /{{page.lang}}/{% translate bitcoin-core-help url %}#forums
-[bcc help]: /{{page.lang}}/{% translate bitcoin-core-help url %}
-[bcc live help]: /{{page.lang}}/{% translate bitcoin-core-help url %}#live
-[bcc main]: /{{page.lang}}/{% translate bitcoin-core-overview url %}
-[bcc network support]: /{{page.lang}}/{% translate bitcoin-core-network-support url %}
-[bcc privacy]: /{{page.lang}}/{% translate bitcoin-core-privacy url %}
-[bcc privacy data leaking]: /{{page.lang}}/{% translate bitcoin-core-privacy url %}#perfect-privacy-for-received-transactions
-[bcc requirements]: /{{page.lang}}/{% translate bitcoin-core-requirements url %}
-[bcc user interface]: /{{page.lang}}/{% translate bitcoin-core-user-interface url %}
-[bcc user interface lightweight]: /{{page.lang}}/{% translate bitcoin-core-user-interface url %}#lightweight
-[bcc validation]: /{{page.lang}}/{% translate bitcoin-core-validation url %}
-[bcc validation decentralization]: /{{page.lang}}/{% translate bitcoin-core-validation url %}#help-protect-decentralization
-[bcc validation do you validate]: /{{page.lang}}/{% translate bitcoin-core-validation url %}#do-you-validate
-[bcc validation protection]: /{{page.lang}}/{% translate bitcoin-core-validation url %}#how-validation-protects-your-bitcoins
+[bcc contribute documentation]: /en/bitcoin-core/contribute/documentation
+[bcc contribute issues]: /en/bitcoin-core/contribute/issues
+[bcc contribute support]: /en/bitcoin-core/contribute/support
+[bcc contribute translations]: /en/bitcoin-core/contribute/translations
+[bcc decentralized peer discovery]: /en/bitcoin-core/features/privacy#decentralized-peer-discovery
+[bcc documentation]: /en/bitcoin-core/help#documentation
+[bcc download]: /en/download
+[bcc features]: /en/bitcoin-core/features/
+[bcc forums]: /en/bitcoin-core/help#forums
+[bcc help]: /en/bitcoin-core/help
+[bcc live help]: /en/bitcoin-core/help#live
+[bcc main]: /en/bitcoin-core/
+[bcc network support]: /en/bitcoin-core/features/network-support
+[bcc privacy]: /en/bitcoin-core/features/privacy
+[bcc privacy data leaking]: /en/bitcoin-core/features/privacy#perfect-privacy-for-received-transactions
+[bcc requirements]: /en/bitcoin-core/features/requirements
+[bcc user interface]: /en/bitcoin-core/features/user-interface
+[bcc user interface lightweight]: /en/bitcoin-core/features/user-interface#lightweight
+[bcc validation]: /en/bitcoin-core/features/validation
+[bcc validation decentralization]: /en/bitcoin-core/features/validation#help-protect-decentralization
+[bcc validation do you validate]: /en/bitcoin-core/features/validation#do-you-validate
+[bcc validation protection]: /en/bitcoin-core/features/validation#how-validation-protects-your-bitcoins
 [bcc version history]: /en/version-history
 
 [Bitcoin Core 0.6.0]: /en/release/v0.6.0

diff --git a/_templates/bitcoin-core-overview.html b/_templates/bitcoin-core-overview.html
diff --git a/_translations/en.yml b/_translations/en.yml
@@ -28,50 +28,6 @@ en:
     owners: "Domain Owners"
     partial_list: "Partial List"
     github: "Contributors on GitHub"
-  bitcoin-core-overview:
-    title: "Bitcoin Core"
-    bitcoin-core: "Bitcoin Core"
-    bitcoin-core-slogan: "Helping <b>you</b> keep Bitcoin decentralized"
-    download-bitcoin-core: "Download Bitcoin Core"
-    about1: >
-      Bitcoin Core is programmed to decide which block chain contains
-      valid transactions. The users of Bitcoin Core only accept
-      transactions for that block chain, making it the Bitcoin block
-      chain that everyone else wants to use.
-
-    about2: >
-      It is these users who <b>keep Bitcoin decentralized.</b> They
-      individually run their own Bitcoin Core full nodes, and each of
-      those full nodes separately follows the exact same rules to decide
-      which block chain is valid.
-
-    about3: >
-      There's no voting or other corruptible process involved: there's
-      just individual software following identical rules—"math"—to
-      evaluate identical blocks and coming to identical conclusions
-      about which block chain is valid.
-
-    about4: >
-      This shared agreement (called consensus) allows people like you to
-      only accept valid bitcoins, <b>enforcing Bitcoin's rules</b> against
-      even the most powerful miners.
-
-    about5: >
-      In addition to improving Bitcoin's decentralization, Bitcoin Core
-      users get better security for their bitcoins, privacy features not
-      available in other wallets, a choice of user interfaces, and
-      several other powerful features.
-
-    read-more: "Read more"
-    news: "News"
-
-    more-news-and-rss: >
-      For more news, see the complete list of <a
-      href="/en/version-history">Bitcoin Core releases</a>. For
-      notifications of new releases, <a type="application/rss+xml"
-      href="/en/rss/releases.rss">subscribe to the RSS feed</a>.
-
-
   bitcoin-for-businesses:
     title: "Bitcoin for Businesses - Bitcoin"
     pagetitle: "Bitcoin for Businesses"
@@ -876,37 +832,8 @@ en:
     sponsor: "A community website sponsored by"
     getstarted: "Get started with Bitcoin"
     bitcoin-core: "Bitcoin Core"
-    menu-bcc-features: "Features"
-    menu-bcc-features-overview: "Overview"
-    menu-bcc-help: "Get Help"
-    menu-bcc-contribute: "Contribute"
-    menu-bcc-news: "News"
-    menu-bcc-download: "Download"
-    menu-bcc-validation: "Validation"
-    menu-bcc-privacy: "Privacy"
-    menu-bcc-requirements: "Requirements"
-    menu-bcc-user-interface: "User Interface"
-    menu-bcc-network-support: "Network Support"
-    menu-bcc-contribute-issues: "Bug reports"
-    menu-bcc-contribute-code: "Code"
-    menu-bcc-contribute-documentation: "Documentation"
-    menu-bcc-contribute-translations: "Translations"
-    menu-bcc-contribute-tech-support: "Tech Support"
   url:
     about-us: about-us
-    bitcoin-core-contribute: bitcoin-core/contribute/
-    bitcoin-core-contribute-documentation: bitcoin-core/contribute/documentation
-    bitcoin-core-contribute-issues: bitcoin-core/contribute/issues
-    bitcoin-core-contribute-translations: bitcoin-core/contribute/translations
-    bitcoin-core-contribute-tech-support: bitcoin-core/contribute/support
-    bitcoin-core-features: bitcoin-core/features/
-    bitcoin-core-help: bitcoin-core/help
-    bitcoin-core-network-support: bitcoin-core/features/network-support
-    bitcoin-core-overview: bitcoin-core/
-    bitcoin-core-privacy: bitcoin-core/features/privacy
-    bitcoin-core-requirements: bitcoin-core/features/requirements
-    bitcoin-core-user-interface: bitcoin-core/features/user-interface
-    bitcoin-core-validation: bitcoin-core/features/validation
     bitcoin-for-developers: bitcoin-for-developers
     bitcoin-for-individuals: bitcoin-for-individuals
     bitcoin-for-businesses: bitcoin-for-businesses