Skip to content

Commit d55fb59

Browse files
Genora51Genora51
committed
Merge branch 'master' into localization
2 parents 6ed7966 + d81adc1 commit d55fb59

File tree

12 files changed

+93
-76
lines changed

12 files changed

+93
-76
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2017 8values. http://8values.github.io.
3+
Copyright (c) 2020 8values. http://8values.github.io.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# 8values.github.io
2-
The 8values Political Quiz measures individuals' political values, including Equality, Might, Liberty, Tradition, Wealth, Peace, Authority, and Progress.
2+
The 8values Political Quiz measures individuals' political values, including Equality, Nation, Liberty, Tradition, Markets, World, Authority, and Progress.

‎ideologies.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@ ideologies = {
116116
"ideo20": {
117117
"econ": 60,
118118
"dipl": 60,
119-
"govt": 40,
119+
"govt": 50,
120120
"scty": 30
121121
},
122122
"ideo21": {
123123
"econ": 60,
124124
"dipl": 70,
125-
"govt": 40,
125+
"govt": 60,
126126
"scty": 80
127127
},
128128
"ideo22": {
@@ -170,7 +170,7 @@ ideologies = {
170170
"ideo29": {
171171
"econ": 50,
172172
"dipl": 50,
173-
"govt": 0,
173+
"govt": 100,
174174
"scty": 20
175175
},
176176
"ideo30": {
@@ -304,5 +304,11 @@ ideologies = {
304304
"dipl": 50,
305305
"govt": 100,
306306
"scty": 50
307+
},
308+
"ideo52": {
309+
"econ": 10,
310+
"dipl": 50,
311+
"govt": 90,
312+
"scty": 40
307313
}
308314
};

‎index.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<script src="https://unpkg.com/i18next-xhr-backend@1.4.1/i18nextXHRBackend.min.js"></script>
2020
<script type="application/javascript" src="i18n.js"></script>
2121

22+
<a href="https://github.com/8values/8values.github.io" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
2223
<h1>8values</h1>
2324
<hr>
2425
<button data-i18n="start" class="button" onclick="location.href='instructions.html';" style="font-size:36pt;"></button>
@@ -99,4 +100,10 @@ <h2 data-i18n="faq_scores"></h2>
99100
class="statcounter"
100101
src="//c.statcounter.com/11325211/0/fd9f0659/1/" alt="web
101102
stats"></a></div></noscript>
103+
104+
<!-- This is the script for the page itself -->
105+
<script type="application/javascript"src="questions.js"></script>
106+
<script type="text/javascript">
107+
document.getElementById("numOfQuestions").innerHTML = questions.length;
108+
</script>
102109
</body>

‎locales/de/ideologies.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@
4949
"ideo48": "Marktanarchismus",
5050
"ideo49": "Totalitärer Kapitalismus",
5151
"ideo50": "Ultra-Kapitalismus",
52-
"ideo51": "Anarcho-Kapitalismus"
52+
"ideo51": "Anarcho-Kapitalismus",
53+
"ideo52": "Objektivismus"
5354
}

‎locales/en/ideologies.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@
4949
"ideo48": "Market Anarchism",
5050
"ideo49": "Totalitarian Capitalism",
5151
"ideo50": "Ultra-Capitalism",
52-
"ideo51": "Anarcho-Capitalism"
52+
"ideo51": "Anarcho-Capitalism",
53+
"ideo52": "Objectivism"
5354
}

‎locales/es/ideologies.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@
4949
"ideo48": "Anarqu\u00eda de Mercado",
5050
"ideo49": "Capitalismo Totalitario",
5151
"ideo50": "Ultra-Capitalismo",
52-
"ideo51": "Anarco-Capitalismo"
52+
"ideo51": "Anarco-Capitalismo",
53+
"ideo52": "Objetivismo"
5354
}

‎locales/pt/ideologies.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@
4949
"ideo48": "Anarquismo de Mercado",
5050
"ideo49": "Capitalismo Totalitário",
5151
"ideo50": "Ultracapitalismo",
52-
"ideo51": "Anarcocapitalismo"
52+
"ideo51": "Anarcocapitalismo",
53+
"ideo52": "Objetivismo"
5354
}

‎questions.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ questions = [
4747
{
4848
"question": "q62",
4949
"effect": {
50-
"econ": -5,
50+
"econ": 5,
5151
"dipl": 0,
52-
"govt": 10,
52+
"govt": -10,
5353
"scty": 0
5454
}
5555
},
@@ -59,7 +59,7 @@ questions = [
5959
"econ": 10,
6060
"dipl": 0,
6161
"govt": 0,
62-
"scty": 5
62+
"scty": 0
6363
}
6464
},
6565
{
@@ -68,7 +68,7 @@ questions = [
6868
"econ": -10,
6969
"dipl": 0,
7070
"govt": 0,
71-
"scty": -5
71+
"scty": 0
7272
}
7373
},
7474
{
@@ -122,7 +122,7 @@ questions = [
122122
"econ": 10,
123123
"dipl": 0,
124124
"govt": 0,
125-
"scty": 10
125+
"scty": 5
126126
}
127127
},
128128
{
@@ -228,7 +228,7 @@ questions = [
228228
"question": "q20",
229229
"effect": {
230230
"econ": 0,
231-
"dipl": -10,
231+
"dipl": 10,
232232
"govt": 0,
233233
"scty": 10
234234
}
@@ -265,7 +265,7 @@ questions = [
265265
"effect": {
266266
"econ": 0,
267267
"dipl": -10,
268-
"govt": -10,
268+
"govt": -5,
269269
"scty": 0
270270
}
271271
},
@@ -400,7 +400,7 @@ questions = [
400400
"effect": {
401401
"econ": 0,
402402
"dipl": 0,
403-
"govt": -10,
403+
"govt": -5,
404404
"scty": -10
405405
}
406406
},
@@ -543,7 +543,7 @@ questions = [
543543
"question": "q53",
544544
"effect": {
545545
"econ": 0,
546-
"dipl": 10,
546+
"dipl": 0,
547547
"govt": -10,
548548
"scty": 0
549549
}
@@ -605,7 +605,7 @@ questions = [
605605
{
606606
"question": "q73",
607607
"effect": {
608-
"econ": 10,
608+
"econ": 0,
609609
"dipl": 10,
610610
"govt": 0,
611611
"scty": 0

‎quiz.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ <h2 style="text-align:center;" id="question-number" data-i18n="question_no" data
4949
src="//c.statcounter.com/11325211/0/fd9f0659/1/" alt="web
5050
stats"></a></div></noscript>
5151

52+
<!-- JavaScript for the test itself -->
5253
<script>
5354
i18n_load_ns([ "questions", "quiz", "translation" ], display_progress)
5455

0 commit comments

Comments
 (0)