Skip to content

Commit 5ab0e2b

Browse files
gervasiocajgervasiocaj
committed
Merge branch 'master' into localization
2 parents 6200b85 + cb41063 commit 5ab0e2b

23 files changed

+3241
-2027
lines changed

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License
2+
3+
Copyright (c) 2017 8values. http://8values.github.io.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎index.html‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
<link rel="icon" type="x-icon" href="icon.png">
66
<link rel="shortcut icon" type="x-icon" href="icon.png">
77
<meta charset="utf-8">
8+
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
9+
<script>
10+
(adsbygoogle = window.adsbygoogle || []).push({
11+
google_ad_client: "ca-pub-6511426299019766",
12+
enable_page_level_ads: true
13+
});
14+
</script>
815
</head>
916
<body>
1017
<script src="https://unpkg.com/[email protected]/i18next.min.js"></script>
@@ -20,7 +27,7 @@ <h1>8values</h1>
2027
<h2 data-i18n="faq_whatis"></h2>
2128
<p data-i18n="faq_whatis_answer"></p>
2229

23-
<h2 id="faq_values" class="translate"></h2>
30+
<h2 data-i18n="faq_values"></h2>
2431
<p data-i18n="faq_values_answer"></p>
2532
<p data-i18n="equality" class="value-description"></p>
2633
<p data-i18n="wealth" class="value-description"></p>
@@ -38,4 +45,21 @@ <h2 data-i18n="faq_scores"></h2>
3845
<script type="text/javascript">
3946
i18n_load_ns()
4047
</script>
48+
49+
<!-- Website visit statistics - no personal information is collected! -->
50+
<script type="text/javascript">
51+
var sc_project=11325211;
52+
var sc_invisible=1;
53+
var sc_security="fd9f0659";
54+
var scJsHost = (("https:" == document.location.protocol) ?
55+
"https://secure." : "http://www.");
56+
document.write("<sc"+"ript type='text/javascript' src='" +
57+
scJsHost+
58+
"statcounter.com/counter/counter.js'></"+"script>");
59+
</script>
60+
<noscript><div class="statcounter"><a title="web stats"
61+
href="http://statcounter.com/" target="_blank"><img
62+
class="statcounter"
63+
src="//c.statcounter.com/11325211/0/fd9f0659/1/" alt="web
64+
stats"></a></div></noscript>
4165
</body>

‎instructions.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
<link rel="icon" type="x-icon" href="icon.png">
66
<link rel="shortcut icon" type="x-icon" href="icon.png">
77
<meta charset="utf-8">
8+
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
9+
<script>
10+
(adsbygoogle = window.adsbygoogle || []).push({
11+
google_ad_client: "ca-pub-6511426299019766",
12+
enable_page_level_ads: true
13+
});
14+
</script>
815
</head>
916
<body>
1017
<script src="https://unpkg.com/[email protected]/i18next.min.js"></script>
@@ -22,4 +29,21 @@ <h2 data-i18n="title" data-ns="instructions" style="text-align:center;"></h2>
2229
<script type="text/javascript">
2330
i18n_load_ns("instructions")
2431
</script>
32+
33+
<!-- Website visit statistics - no personal information is collected! -->
34+
<script type="text/javascript">
35+
var sc_project=11325211;
36+
var sc_invisible=1;
37+
var sc_security="fd9f0659";
38+
var scJsHost = (("https:" == document.location.protocol) ?
39+
"https://secure." : "http://www.");
40+
document.write("<sc"+"ript type='text/javascript' src='" +
41+
scJsHost+
42+
"statcounter.com/counter/counter.js'></"+"script>");
43+
</script>
44+
<noscript><div class="statcounter"><a title="web stats"
45+
href="http://statcounter.com/" target="_blank"><img
46+
class="statcounter"
47+
src="//c.statcounter.com/11325211/0/fd9f0659/1/" alt="web
48+
stats"></a></div></noscript>
2549
</body>

‎locales/en/ideologies.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"ideo4": "Marxism",
66
"ideo5": "De Leonism",
77
"ideo6": "Leninism",
8-
"ideo7": "Stalinism-Maoism",
8+
"ideo7": "Stalinism/Maoism",
99
"ideo8": "Religious Communism",
1010
"ideo9": "State Socialism",
1111
"ideo10": "Theocratic Socialism",
@@ -50,4 +50,4 @@
5050
"ideo49": "Totalitarian Capitalism",
5151
"ideo50": "Ultra-Capitalism",
5252
"ideo51": "Anarcho-Capitalism"
53-
}
53+
}

‎locales/en/matches.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"econ": ["Communist","Socialist","Egalitarian","Centrist","Market","Capitalist","Laissez-Faire"],
3-
"dipl": ["Ultra-Pacifist","Pacifist","Dovish","Balanced","Hawkish","Militarist","Ultra-Militarist"],
2+
"econ": ["Communist","Socialist","Social","Centrist","Market","Capitalist","Laissez-Faire"],
3+
"dipl": ["Cosmopolitan","Internationalist","Peaceful","Balanced","Patriotic","Nationalist","Chauvinist"],
44
"govt": ["Anarchist","Libertarian","Liberal","Moderate","Statist","Authoritarian","Totalitarian"],
55
"scty": ["Revolutionary","Very Progressive","Progressive","Neutral","Traditional","Very Traditional","Reactionary"]
6-
}
6+
}

‎locales/en/questions.json‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,75 @@
11
{
2-
"q1": "Oppression by corporations is as much, if not more, of a concern than oppression by governments.",
3-
"q2": "It is necessary for the government to intervene in the economy to protect citizens.",
2+
"q1": "Oppression by corporations is more of a concern than oppression by governments.",
3+
"q2": "It is necessary for the government to intervene in the economy to protect consumers.",
44
"q3": "The freer the markets, the freer the people.",
55
"q4": "Publicly-funded research is more beneficial to the people than leaving it to the market.",
66
"q5": "From each according to his ability, to each according to his needs.",
77
"q6": "It would be best if social programs were abolished in favor of private charity.",
88
"q7": "Taxes should be increased on the rich to provide for the poor.",
9-
"q8": "Inheritance and capital gains are legitimate forms of wealth.",
9+
"q8": "Inheritance is a legitimate form of wealth.",
1010
"q9": "Public utilities like roads and electricity should be publicly owned.",
1111
"q10": "Those with a greater ability to pay should receive better healthcare.",
12-
"q11": "Adequate education is a right of all people.",
12+
"q11": "Quality education is a right of all people.",
1313
"q12": "The means of production should belong to the workers who use them.",
1414
"q13": "The United Nations should be abolished.",
15-
"q14": "Military intervention is often necessary to protect the nation.",
15+
"q14": "Military action by our nation is often necessary to protect it.",
1616
"q15": "It is more important to retain peaceful relations than to further our strength.",
1717
"q16": "Wars do not need to be justified to other countries.",
1818
"q17": "Military spending is a waste of money.",
1919
"q18": "International aid is a waste of money.",
20-
"q19": "My nation is the best in the world.",
20+
"q19": "My nation is great.",
2121
"q20": "Research should be conducted on an international scale.",
2222
"q21": "Governments should be accountable to the international community.",
2323
"q22": "Even when protesting an authoritarian government, violence is not acceptable.",
24-
"q23": "My religion should be spread by force if necessary.",
25-
"q24": "My political ideology should be spread by force if necessary.",
26-
"q25": "Law and order should be maintained at all costs.",
27-
"q26": "Political elites are necessary, as the general populace makes bad decisions.",
28-
"q27": "A victimless crime, such as drug use, should not be a crime at all.",
29-
"q28": "Terrorism is a major threat, and some civil liberties must be sacrificed to prevent it.",
24+
"q23": "My religious values should be spread as much as possible.",
25+
"q24": "Our nation's values should be spread as much as possible.",
26+
"q25": "It is very important to maintain law and order.",
27+
"q26": "The general populace makes poor decisions.",
28+
"q27": "Victimless crimes (such as drug use) should not be crimes at all.",
29+
"q28": "The sacrifice of some civil liberties is necessary to protect us from acts of terrorism.",
3030
"q29": "Government surveillance is necessary in the modern world.",
3131
"q30": "The very existence of the state is a threat to our liberty.",
3232
"q31": "Regardless of political opinions, it is important to side with your country.",
3333
"q32": "No authority should be left unquestioned.",
34-
"q33": "A strongly hierarchical state is most efficient.",
34+
"q33": "A hierarchical state is best.",
3535
"q34": "It is important that the government follows the majority opinion, even if it is wrong.",
3636
"q35": "The stronger the leadership, the better.",
37-
"q36": "Democracy is intrinsically valuable as more than a decision-making process.",
37+
"q36": "Democracy is more than a decision-making process.",
3838
"q37": "Environmental regulations are essential.",
3939
"q38": "A better world will come from automation, science, and technology.",
4040
"q39": "Children should be educated in religious or traditional values.",
41-
"q40": "Irrational traditions should be abolished.",
41+
"q40": "Traditions are of no value on their own.",
4242
"q41": "Religion should play a role in government.",
43-
"q42": "Churches should not be exempt from taxes.",
44-
"q43": "Climate change is either not real or not man-made.",
43+
"q42": "Churches should be taxed the same way other institutions are taxed.",
44+
"q43": "Climate change is currently one of the greatest threats to our way of life.",
4545
"q44": "It is important that we work as a united world to combat climate change.",
4646
"q45": "Society was better many years ago than it is now.",
47-
"q46": "It is important that we stay connected to our past.",
47+
"q46": "It is important that we maintain the traditions of our past.",
4848
"q47": "It is important that we think in the long term, beyond our lifespans.",
4949
"q48": "Reason is more important than maintaining our culture.",
5050
"q49": "Drug use should be legalized or decriminalized.",
5151
"q50": "Same-sex marriage should be legal.",
5252
"q51": "Sex outside marriage is immoral.",
53-
"q52": "Abortion should be prohibited.",
53+
"q52": "Abortion should be prohibited in most or all cases.",
5454
"q53": "Gun ownership should be prohibited for those without a valid reason.",
5555
"q54": "I support single-payer, universal healthcare.",
56-
"q55": "I support the European Union.",
56+
"q55": "I support regional unions, such as the European Union.",
5757
"q56": "Communism isn't as bad as people say it is.",
5858
"q57": "Fascism isn't as bad as people say it is.",
5959
"q58": "Capitalism isn't as bad as people say it is.",
60-
"q59": "All people, cultures, worldviews, genders, sexualities, and economic classes should be treated equally.",
61-
"q60": "It is important that we further our ethnic, cultural, or economic group's goals above all others."
60+
"q59": "All people - regardless of factors like culture or sexuality - should be treated equally.",
61+
"q60": "It is important that we further my group's goals above all others.",
62+
"q61": "It is better to maintain a balanced budget than to ensure welfare for all citizens.",
63+
"q62": "International trade is beneficial.",
64+
"q63": "Excessive government intervention is a threat to the economy.",
65+
"q64": "Prostitution should be illegal.",
66+
"q65": "It is important to maintain our national sovereignty.",
67+
"q66": "A united world government would be beneficial to mankind.",
68+
"q67": "No cultures are superior to others.",
69+
"q68": "If we accept migrants at all, it is important that they assimilate into our culture.",
70+
"q69": "Maintaining family values is essential.",
71+
"q70": "To chase progress at all costs is dangerous.",
72+
"q71": "Genetic modification is a force for good, even on humans.",
73+
"q72": "We should open our borders to immigration.",
74+
"q73": "Governments should be as concerned about foreign citizens as they are about those within their borders."
6275
}

‎locales/en/translation.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"faq_whatis": "What is 8values?",
44
"faq_whatis_answer": "8values is, in essence, a political quiz that attempts to assign percentages for eight different political values. You will be presented by a statement, and then you will answer with your opinion on the statement, from <b>Strongly Agree</b> to <b>Strongly Disagree</b>, with each answer slightly affecting your scores. At the end of the quiz, your answers will be compared to the maximum possible for each value, thus giving you a percentage. Answer honestly!",
55
"faq_values": "What are the eight values?",
6-
"faq_values_answer": "There are four indendent axes - Economic, Diplomatic, State, and Society - and each has two opposing values assigned to them. They are:",
6+
"faq_values_answer": "There are four independent axes - Economic, Diplomatic, State, and Society - and each has two opposing values assigned to them. They are:",
77
"faq_match": "What's the &quot;Closest Match&quot; mean at the bottom of the results?",
88
"faq_match_answer": "In addition to matching you to the eight values, the quiz also attempts to match you to a political ideology. This is a work in progress and is much less accurate than the values and axes, so don't take it too seriously. If you disagree with your assigned ideology, send us an email at [email protected] with your scores, matched ideology, and preferred ideology, and we'll look into adjusting the system. Thanks!",
99
"faq_scores": "I don't like my scores!",
10-
"faq_scores_answer": "¯\\_(ツ)_/¯<br/>If you have any suggestions or constructive criticism, feel free to send it to [email protected]",
11-
10+
"faq_scores_answer": "¯\\_(ツ)_/¯<br/>If you have any suggestions or constructive criticism, feel free to send it to [email protected] or open an issue on the GitHub page!",
11+
1212
"equality": "<b class=\"equality\">Equality</b> (Economic)<br/>Those with higher Equality scores believe the economy should distribute value evenly among the populace. They tend to support progressive tax codes, social programs, and at high values, socialism.",
13-
"wealth": "<b class=\"wealth\">Wealth</b> (Economic)<br/>Those with higher Wealth scores believe the economy should be focused on rapid growth. They tend to support lower taxes, privatization, deregulation, and at high values, laissez-faire capitalism.",
14-
"might": "<b class=\"might\">Might</b> (Diplomatic)<br/>Those with higher Might scores believe in an aggressive, or hawkish, foreign policy. They tend to support high military spending, nationalism, rivalry with other countries, and at high values, rapid military expansion.",
15-
"peace": "<b class=\"peace\">Peace</b> (Diplomatic)<br/>Those with higher Peace scores believe in an peaceful, or dovish, foreign policy. They tend to support low military spending, international aid, cooperation with other countries, and at high values, pacifism.",
13+
"wealth": "<b class=\"wealth\">Markets</b> (Economic)<br/>Those with higher Market scores believe the economy should be focused on rapid growth. They tend to support lower taxes, privatization, deregulation, and at high values, laissez-faire capitalism.",
14+
"might": "<b class=\"might\">Nation</b> (Diplomatic)<br/>Those with higher Nation scores are patriotic and nationalist. They often believe in an aggressive foreign policy, valuing the military, strength, sovereignty, and at high values, territorial expansion.",
15+
"peace": "<b class=\"peace\">Globe</b> (Diplomatic)<br/>Those with higher Globe scores are cosmopolitan and globalist. They often believe in a peaceful foreign policy, emphasizing diplomacy, cooperation, integration, and at high values, a world government.",
1616
"liberty": "<b class=\"liberty\">Liberty</b> (State)<br/>Those with higher Liberty scores believe in strong civil liberties. They tend to support democracy and oppose state intervention in personal lives. Note that this refers to civil liberties, not economic liberties.",
1717
"authority": "<b class=\"authority\">Authority</b> (State)<br/>Those with higher Authority scores believe in strong state power. They tend to support state intervention in personal lives, government surveillance, and at high values, censorship or autocracy.",
1818
"tradition": "<b class=\"tradition\">Tradition</b> (Society)<br/>Those with higher Tradition scores believe in traditional values and strict adherence to a moral code. Though not always, they are usually religious, and support the status quo or the status quo ante.",
@@ -26,4 +26,4 @@
2626
"closest_match": "Closest Match: ",
2727
"match_desc": "Ideological matching is a work in progress, and is much less accurate than the values and axes.<br>You can send these results by copying and pasting the URL at the top of the page or using the image below. Think your matched ideology was wrong? Want to help us calibrate the test? Send the results along with your political ideology to us at [email protected], or send us any comments, questions, or criticism.",
2828
"back": "Back"
29-
}
29+
}

‎locales/pt/translation.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"start": "Clique aqui para iniciar!",
3-
"faq_whatis": "O que é o 8values?"
3+
"faq_whatis": "O que é o 8values?",
4+
"back": "Voltar"
45
}

0 commit comments

Comments
 (0)