Merge branch 'release/1.0.20'

.gitignore

@@ -24,6 +24,7 @@ env
 
 # Misc
 /scripts/*.json
+!/scripts/en.json
 /scripts/*.csv
 
 /scripts/consent_forms/*csv

app/components/exp-player/component.js

@@ -37,6 +37,14 @@ export default ExpPlayer.extend({
                 account.set('extra', dest);
                 return account.save();
             }).catch( e => console.error('Could not mark account as having completed study:', e));
-        }
+        },
+        saveFrame() {
+            return this._super(...arguments).catch((e) => {
+                // intercept, tag, and log error
+                e.message = 'intercepted: ' + e.message;
+                this.get('raven').captureException(e, {tags: {is_intercepted: true}});
+                throw e;
+            });
+        },
     }
 });

app/locales/en/translations.js

@@ -106,8 +106,8 @@ const translations = {
             "labelUnaccepted": "Please accept terms to continue"
         },
         "checkboxLabel": "I have read and understand the above statements and agree to participate.",
-        "firstSection": "Welcome to our study.  Your participation will be in one session and will take less than one hour. You will be asked to describe a situation you experienced recently and your behaviors in it. You will also be asked some questions about your values and attitudes.  At the end of the study, if you choose, you will receive personalized information about your personality.",
-        "secondSection": "All of your responses will be confidential and identified only by a number (and not by your name).  For research purposes, these anonymous data may be archived in an online database maintained by the Center for Open Science (www.cos.io). Each question must be answered in order to complete this survey, but you can discontinue your participation at any time without penalty.  The potential benefits of this research include improving the understanding of persons and their lives across cultural contexts.  There are no known risks.",
+        "firstSection": "Welcome to our study. Your participation will be in one session and will take less than one hour. You will be asked to describe a situation you experienced recently and your behaviors in it. You will also be asked some questions about your values and attitudes. At the end of the study, if you choose, you will receive personalized information about your personality.",
+        "secondSection": "All of your responses will be confidential and identified only by a number (and not by your name). For research purposes, these anonymous data may be archived in an online database maintained by the Center for Open Science (www.cos.io). Each question must be answered in order to complete this survey, but you can discontinue your participation at any time without penalty. The potential benefits of this research include improving the understanding of persons and their lives across cultural contexts. There are no known risks.",
         "thirdSection": "If you have any questions about this study or your rights as a participant, you may contact [local collaborator’s name, email and affiliation], who is responsible for data collection at your location, or the University of California, Riverside, Office of Research Integrity by email at [email protected]. We sincerely appreciate your cooperation.",
         "title": "Consent to Participate in Research",
         "versionHistory": "(Consent form version: 14 October 2016)"

app/locales/nl/translations.js

@@ -207,7 +207,7 @@ export default {
             "10": {
                 "items": {
                     "1": {
-                        "label": "Heel wat"
+                        "label": "Er zijn veel sociale normen waar mensen zich aan moeten houden in dit land."
                     },
                     "2": {
                         "label": "In dit land zijn er hele duidelijke verwachtingen over hoe mensen zich moeten gedragen in de meeste situaties."

app/locales/sv/config.js

@@ -0,0 +1,16 @@
+// Ember-I18n includes configuration for common locales. Most users
+// can safely delete this file. Use it if you need to override behavior
+// for a locale or define behavior for a locale that Ember-I18n
+// doesn't know about.
+export default {
+  // rtl: [true|FALSE],
+  //
+  // pluralForm: function(count) {
+  //   if (count === 0) { return 'zero'; }
+  //   if (count === 1) { return 'one'; }
+  //   if (count === 2) { return 'two'; }
+  //   if (count < 5) { return 'few'; }
+  //   if (count >= 5) { return 'many'; }
+  //   return 'other';
+  // }
+};