🔀 Merge remote-tracking branch 'origin/gh-pages' into feature/russian-translation-review

This commit is contained in:
Maxim Lebedev 2017-08-03 01:41:10 +05:00
commit 669c266e05
No known key found for this signature in database
GPG Key ID: F8978F46FF0FFA4F
4 changed files with 66 additions and 38 deletions

View File

@ -31,6 +31,8 @@
# How-To: Translate this thang! # How-To: Translate this thang!
Translations done so far: [Chinese](http://sekai.co/trust/), [Brazilian Portuguese](https://brunolemos.github.io/trust/)
**Step 1)** Fork or download this repo **Step 1)** Fork or download this repo
(if you're forking it, be sure to make sure *your* repo is on a branch called `gh-pages`, so that GitHub can automatically generate a webpage for it!) (if you're forking it, be sure to make sure *your* repo is on a branch called `gh-pages`, so that GitHub can automatically generate a webpage for it!)

View File

@ -50,6 +50,22 @@ s{
text-decoration: line-through; text-decoration: line-through;
} }
#translations{
margin: 10px auto;
font-size: 16px;
line-height: 21px;
color: #fff;
text-align: center;
}
#translations a{
color:#dd4040;
}
#translations a:hover{
color:#ee5151;
}
/*************************/ /*************************/
/******* SOUND *******/ /******* SOUND *******/
/*************************/ /*************************/

View File

@ -55,8 +55,8 @@ Many thanks again!
<meta property="og:description" content="интерактивное руководство теории игр о том, зачем и как мы доверяем друг другу"> <meta property="og:description" content="интерактивное руководство теории игр о том, зачем и как мы доверяем друг другу">
<!-- Styles --> <!-- Styles -->
<link rel="stylesheet" href="css/slides.css"> <link rel="stylesheet" href="css/slides.css?v6">
<link rel="stylesheet" href="css/balloon.css"> <link rel="stylesheet" href="css/balloon.css?v6">
</head> </head>
<body> <body>
@ -81,55 +81,64 @@ Many thanks again!
text="Люди больше не доверяют друг другу. Зачем? И как это исправить? Интерактивное руководство теории игр о доверии:" text="Люди больше не доверяют друг другу. Зачем? И как это исправить? Интерактивное руководство теории игр о доверии:"
link="http://ncase.me/trust/"></sharing> link="http://ncase.me/trust/"></sharing>
<!-- List of translations thus far! -->
<div id="translations">
fan-translations so far:
<a href="https://github.com/ncase/trust#how-to-translate-this-thang" target="_blank">(add your own!)</a>
<br>
<a href="http://sekai.co/trust/">中文</a> |
<a href="https://brunolemos.github.io/trust/">Português do Brasil</a>
</div>
</div> </div>
</body> </body>
</html> </html>
<!-- Libraries --> <!-- Libraries -->
<script src="js/lib/helpers.js?v5"></script> <script src="js/lib/helpers.js?v6"></script>
<script src="js/lib/pegasus.js?v5"></script> <script src="js/lib/pegasus.js?v6"></script>
<script>var c_ = {};</script> <script>var c_ = {};</script>
<script src="js/lib/minpubsub.src.js?v5"></script> <script src="js/lib/minpubsub.src.js?v6"></script>
<script src="js/lib/q.js?v5"></script> <script src="js/lib/q.js?v6"></script>
<script src="js/lib/pixi.min.js?v5"></script> <script src="js/lib/pixi.min.js?v6"></script>
<script src="js/lib/howler.js?v5"></script> <script src="js/lib/howler.js?v6"></script>
<script>var createjs = window;</script> <script>var createjs = window;</script>
<script src="js/lib/tweenjs-0.6.2.min.js?v5"></script> <script src="js/lib/tweenjs-0.6.2.min.js?v6"></script>
<script>Ticker.framerate=60; Ticker.paused=true;</script> <script>Ticker.framerate=60; Ticker.paused=true;</script>
<script src="js/lib/sharing.js?v5"></script> <script src="js/lib/sharing.js?v6"></script>
<!-- Core Engine --> <!-- Core Engine -->
<script src="js/core/Loader.js?v5"></script> <script src="js/core/Loader.js?v6"></script>
<script src="js/core/Slideshow.js?v5"></script> <script src="js/core/Slideshow.js?v6"></script>
<script src="js/core/SlideSelect.js?v5"></script> <script src="js/core/SlideSelect.js?v6"></script>
<script src="js/core/Button.js?v5"></script> <script src="js/core/Button.js?v6"></script>
<script src="js/core/TextBox.js?v5"></script> <script src="js/core/TextBox.js?v6"></script>
<script src="js/core/Words.js?v5"></script> <script src="js/core/Words.js?v6"></script>
<script src="js/core/IncDecNumber.js?v5"></script> <script src="js/core/IncDecNumber.js?v6"></script>
<script src="js/core/Slider.js?v5"></script> <script src="js/core/Slider.js?v6"></script>
<script src="js/core/Scratcher.js?v5"></script> <script src="js/core/Scratcher.js?v6"></script>
<script src="js/core/Background.js?v5"></script> <script src="js/core/Background.js?v6"></script>
<script src="js/core/ImageBox.js?v5"></script> <script src="js/core/ImageBox.js?v6"></script>
<script src="js/core/PayoffsUI.js?v5"></script> <script src="js/core/PayoffsUI.js?v6"></script>
<!-- Simulations --> <!-- Simulations -->
<script src="js/sims/Splash.js?v5"></script> <script src="js/sims/Splash.js?v6"></script>
<script src="js/sims/PD.js?v5"></script> <script src="js/sims/PD.js?v6"></script>
<script src="js/sims/Iterated.js?v5"></script> <script src="js/sims/Iterated.js?v6"></script>
<script src="js/sims/Tournament.js?v5"></script> <script src="js/sims/Tournament.js?v6"></script>
<script src="js/sims/SandboxUI.js?v5"></script> <script src="js/sims/SandboxUI.js?v6"></script>
<!-- Slides --> <!-- Slides -->
<script src="js/slides/0_Slides_Intro.js?v5"></script> <script src="js/slides/0_Slides_Intro.js?v6"></script>
<script src="js/slides/1_Slides_OneOff.js?v5"></script> <script src="js/slides/1_Slides_OneOff.js?v6"></script>
<script src="js/slides/2_Slides_Iterated.js?v5"></script> <script src="js/slides/2_Slides_Iterated.js?v6"></script>
<script src="js/slides/3_Slides_Tournament.js?v5"></script> <script src="js/slides/3_Slides_Tournament.js?v6"></script>
<script src="js/slides/4_Slides_Evolution.js?v5"></script> <script src="js/slides/4_Slides_Evolution.js?v6"></script>
<script src="js/slides/5_Slides_Distrust.js?v5"></script> <script src="js/slides/5_Slides_Distrust.js?v6"></script>
<script src="js/slides/6_Slides_Noise.js?v5"></script> <script src="js/slides/6_Slides_Noise.js?v6"></script>
<script src="js/slides/7_Slides_Sandbox.js?v5"></script> <script src="js/slides/7_Slides_Sandbox.js?v6"></script>
<script src="js/slides/8_Slides_Conclusion.js?v5"></script> <script src="js/slides/8_Slides_Conclusion.js?v6"></script>
<script src="js/slides/9_Slides_Credits.js?v5"></script> <script src="js/slides/9_Slides_Credits.js?v6"></script>
<!-- Main Code --> <!-- Main Code -->
<script src="js/main.js?v5"></script> <script src="js/main.js?v6"></script>

View File

@ -26,6 +26,7 @@ window.onload = function(){
slideSelect.dom.style.display = "none"; slideSelect.dom.style.display = "none";
subscribe("start/game", function(){ subscribe("start/game", function(){
slideSelect.dom.style.display = "block"; slideSelect.dom.style.display = "block";
$("#translations").style.display = "none";
// [FOR DEBUGGING] // [FOR DEBUGGING]
publish("slideshow/next"); publish("slideshow/next");