[UI-LIBRARY][main] 8598 DB Migration changes

public/globals.js

@@ -148,9 +148,9 @@ window.pkp = {
  */
 window.$.pkp = {
 	app: {
-		currentLocale: 'en_US',
-		primaryLocale: 'en_US',
-		rtlLocales: ['ar_AR']
+		currentLocale: 'en',
+		primaryLocale: 'en',
+		rtlLocales: ['ar']
 	},
 	pkpHandler() {
 		alert(

public/mailable.json

@@ -40,55 +40,55 @@
             "alternateTo": null,
             "body": {
                 "fr_CA": "Prière de saisir votre message.",
-                "en_US": "Please enter your message."
+                "en": "Please enter your message."
             },
             "contextId": null,
             "id": null,
             "key": "DISCUSSION_NOTIFICATION_COPYEDITING",
             "name": {
                 "fr_CA": "",
-                "en_US": "Discussion (Copyediting)"
+                "en": "Discussion (Copyediting)"
             },
             "subject": {
                 "fr_CA": "Un message à propos de la revue {$journalName}",
-                "en_US": "A message regarding {$journalName}"
+                "en": "A message regarding {$journalName}"
             }
         },
         {
             "_href": "http://localhost:8000/pu/api/v1/emailTemplates/CITATION_EDITOR_AUTHOR_QUERY",
             "alternateTo": "DISCUSSION_NOTIFICATION_COPYEDITING",
             "body": {
-                "en_US": "{$recipientName},<br />\n<br />\nCould you please verify or provide us with the proper citation for the following reference from your article, {$submissionTitle}:<br />\n<br />\n{$rawCitation}<br />\n<br />\nThanks!<br />\n<br />\n{$senderName}<br />\nCopy-Editor, {$journalName}<br />\n",
+                "en": "{$recipientName},<br />\n<br />\nCould you please verify or provide us with the proper citation for the following reference from your article, {$submissionTitle}:<br />\n<br />\n{$rawCitation}<br />\n<br />\nThanks!<br />\n<br />\n{$senderName}<br />\nCopy-Editor, {$journalName}<br />\n",
                 "fr_CA": "{$recipientName},<br />\n<br />\nPourriez-vous vérifier ou nous fournir la référence bibliographique complète pour la référence suivante, provenant de votre article « {$submissionTitle} »  :<br />\n<br />\n{$rawCitation}<br />\n<br />\nMerci!<br />\n<br />\n{$senderName}<br />\nRéviseur-e, revue {$journalName}<br />\n"
             },
             "contextId": 1,
             "id": 2,
             "key": "CITATION_EDITOR_AUTHOR_QUERY",
             "name": {
-                "en_US": "Question About Citation",
+                "en": "Question About Citation",
                 "fr_CA": ""
             },
             "subject": {
-                "en_US": "Citation Editing",
+                "en": "Citation Editing",
                 "fr_CA": "Modification des références bibliographiques"
             }
         },
         {
             "_href": "http://localhost:8000/pu/api/v1/emailTemplates/COPYEDIT_REQUEST",
             "alternateTo": "DISCUSSION_NOTIFICATION_COPYEDITING",
             "body": {
-                "en_US": "<p>Dear {$recipientName},</p><p>A new submission is ready to be copyedited:</p><p><a href\"{$submissionUrl}\">{$submissionId} {$submissionTitle}</a><br />{$journalName}</p><p>Please follow these steps to complete this task:</p><ol><li>1. Click on the Submission URL below.</li><li>2. Open any files available under Draft Files and edit the files. Use the Copyediting Discussions area if you need to contact the editor(s) or author(s).</li><li>3. Save the copyedited file(s) and upload them to the Copyedited panel.</li><li>4. Use the Copyediting Discussions to notify the editor(s) that all files have been prepared, and that the Production process may begin.</li></ol><p>If you are unable to undertake this work at this time or have any questions, please contact me. Thank you for your contribution to this journal.</p><p>Kind regards,</p>{$signature}",
+                "en": "<p>Dear {$recipientName},</p><p>A new submission is ready to be copyedited:</p><p><a href\"{$submissionUrl}\">{$submissionId} {$submissionTitle}</a><br />{$journalName}</p><p>Please follow these steps to complete this task:</p><ol><li>1. Click on the Submission URL below.</li><li>2. Open any files available under Draft Files and edit the files. Use the Copyediting Discussions area if you need to contact the editor(s) or author(s).</li><li>3. Save the copyedited file(s) and upload them to the Copyedited panel.</li><li>4. Use the Copyediting Discussions to notify the editor(s) that all files have been prepared, and that the Production process may begin.</li></ol><p>If you are unable to undertake this work at this time or have any questions, please contact me. Thank you for your contribution to this journal.</p><p>Kind regards,</p>{$signature}",
                 "fr_CA": "{$recipientName},<br />\n<br />\nJ'aimerais que vous effectuiez la révision du manuscrit intitulé « {$submissionTitle} » pour la revue {$journalName} à l'aide des étapes suivantes.<br />\n1. Cliquer sur l'URL de la soumission ci-dessous.<br />\n2. Ouvrir le(s) fichier(s) disponible(s) sous Fichiers des ébauches finales et effectuer votre révision, tout en ajoutant des discussions sur la révision, le cas échéant.<br />\n3. Enregistrer le(s) fichier(s) révisé(s) et le(s) téléverser dans la section Version(s) révisée(s).<br />\n4. Informer le,la rédacteur-trice que tous les fichiers ont été révisés et que l'étape de production peut débuter.<br />\n<br />\nURL de la revue {$journalName} : {$journalUrl}<br />\nURL de la soumission : {$submissionUrl}<br />\nNom d'utilisateur-trice : {$recipientUsername}"
             },
             "contextId": 1,
             "id": 1,
             "key": "COPYEDIT_REQUEST",
             "name": {
-                "en_US": "Request Copyedit",
+                "en": "Request Copyedit",
                 "fr_CA": ""
             },
             "subject": {
-                "en_US": "Submission {$submissionId} is ready to be copyedited for {$contextAcronym}",
+                "en": "Submission {$submissionId} is ready to be copyedited for {$contextAcronym}",
                 "fr_CA": "Demande de révision d'une soumission"
             }
         }

src/components/Composer/Composer.vue

@@ -207,7 +207,7 @@
 					name="body"
 					:label="bodyLabel"
 					groupId="message"
-					primaryLocale="en_US"
+					primaryLocale="en"
 					:all-errors="errors"
 					:init="bodyInit"
 					:formId="id"

src/components/Form/FormLocales.vue

@@ -68,7 +68,7 @@ export default {
 		 * the primary locale and any other visible locale will be removed. The
 		 * primary locale is always visible.
 		 *
-		 * @param {String} localeKey "en_US"
+		 * @param {String} localeKey "en"
 		 */
 		toggleLocale: function (localeKey) {
 			let selected = [this.primaryLocaleKey];

src/docs/components/Composer/previews/ExampleComposer.vue

@@ -26,19 +26,19 @@ export default {
 					{
 						key: 'EDITOR_DECISION_ACCEPT',
 						subject: {
-							en_US: 'Editor Decision',
+							en: 'Editor Decision',
 						},
 					},
 					{
 						key: 'EXAMPLE_ONE',
 						subject: {
-							en_US: 'Example One',
+							en: 'Example One',
 						},
 					},
 					{
 						key: 'EXAMPLE_TWO',
 						subject: {
-							en_US: 'Example Two',
+							en: 'Example Two',
 						},
 					},
 				];

src/docs/components/Composer/previews/PreviewComposer.vue

@@ -68,48 +68,48 @@ export default {
 			...emailTemplate,
 			key: 'ACCEPTED_CONDITIONAL',
 			name: {
-				en_US: 'Accepted With Conditions',
+				en: 'Accepted With Conditions',
 			},
 			subject: {
-				en_US: 'Accepted With Conditions',
+				en: 'Accepted With Conditions',
 			},
 		});
 		emailTemplates.push({
 			...emailTemplate,
 			key: 'ACCEPTED_EARLY_PUBLICATION',
 			name: {
-				en_US: 'Accepted for Early Publication',
+				en: 'Accepted for Early Publication',
 			},
 			subject: {
-				en_US: 'Accepted for Early Publication',
+				en: 'Accepted for Early Publication',
 			},
 		});
 		const recipientOptions = [
 			{
 				value: 2,
 				label: {
-					en_US: 'Carlo Corino',
+					en: 'Carlo Corino',
 					fr_CA: 'Carlo Fr Corino',
 				},
 			},
 			{
 				value: 3,
 				label: {
-					en_US: 'Daniel Barnes',
+					en: 'Daniel Barnes',
 					fr_CA: 'Daniel Fr Barnes',
 				},
 			},
 			{
 				value: 4,
 				label: {
-					en_US: 'Stephanie Minoue',
+					en: 'Stephanie Minoue',
 					fr_CA: 'Stephanie Fr Minoue',
 				},
 			},
 			{
 				value: 5,
 				label: {
-					en_US: 'Paul Hudson',
+					en: 'Paul Hudson',
 					fr_CA: 'Paul Fr Hudson',
 				},
 			},
@@ -125,10 +125,10 @@ export default {
 			emailTemplates: emailTemplates,
 			emailTemplatesApiUrl:
 				'http://localhost:8000/publicknowledge/api/v1/emailTemplates',
-			locale: 'en_US',
+			locale: 'en',
 			locales: [
 				{
-					locale: 'en_US',
+					locale: 'en',
 					name: 'English',
 				},
 				{
@@ -141,7 +141,7 @@ export default {
 			recipientOptions: recipientOptions,
 			recipients: recipientOptions.map((r) => r.value),
 			variables: {
-				en_US: [...insertContent],
+				en: [...insertContent],
 				fr_CA: [...insertContent],
 			},
 		};

src/docs/components/DecisionPage/previews/PreviewDecisionPage.vue

@@ -292,8 +292,8 @@ export default {
 								id: 'default',
 							},
 						],
-						primaryLocale: 'en_US',
-						visibleLocales: ['en_US'],
+						primaryLocale: 'en',
+						visibleLocales: ['en'],
 						supportedFormLocales: [],
 						errors: {},
 					},
@@ -310,7 +310,7 @@ export default {
 						{
 							value: 31,
 							label: {
-								en_US: 'Rana Baiyewu',
+								en: 'Rana Baiyewu',
 								fr_CA: 'Rana Fr Baiyewu',
 							},
 						},
@@ -322,42 +322,42 @@ export default {
 						{
 							...emailTemplate,
 							name: {
-								en_US: 'Accept for Publication',
+								en: 'Accept for Publication',
 							},
 							subject: {
-								en_US: 'Accept for Publication',
+								en: 'Accept for Publication',
 							},
 						},
 						{
 							...emailTemplate,
 							key: 'EDITOR_DECISION_ACCEPT_CONDITIONS',
 							name: {
-								en_US: 'Accept with Conditions',
+								en: 'Accept with Conditions',
 							},
 							subject: {
-								en_US: 'Accept with Conditions',
+								en: 'Accept with Conditions',
 							},
 						},
 						{
 							...emailTemplate,
 							key: 'EDITOR_DECISION_ACCEPT_EARLY',
 							name: {
-								en_US: 'Accept for Early Publication',
+								en: 'Accept for Early Publication',
 							},
 							subject: {
-								en_US: 'Accept for Early Publication',
+								en: 'Accept for Early Publication',
 							},
 						},
 					],
 					emailTemplatesApiUrl: 'http://example.org',
 					variables: {
-						en_US: [...insertContent],
+						en: [...insertContent],
 						fr_CA: [...insertContent],
 					},
-					locale: 'en_US',
+					locale: 'en',
 					locales: [
 						{
-							locale: 'en_US',
+							locale: 'en',
 							name: 'English',
 						},
 						{
@@ -383,14 +383,14 @@ export default {
 						{
 							value: 10,
 							label: {
-								en_US: 'Adela Gallego',
+								en: 'Adela Gallego',
 								fr_CA: 'Adela Gallego',
 							},
 						},
 						{
 							value: 9,
 							label: {
-								en_US: 'Aisla McCrae',
+								en: 'Aisla McCrae',
 								fr_CA: 'Aisla McCrae',
 							},
 						},
@@ -403,26 +403,26 @@ export default {
 							...emailTemplate,
 							key: 'EDITOR_DECISION_THANK_REVIEWERS',
 							subject: {
-								en_US: 'Thank Reviewer',
+								en: 'Thank Reviewer',
 							},
 						},
 						{
 							...emailTemplate,
 							key: 'EDITOR_DECISION_THANK_REVIEWERS_REQUEST',
 							subject: {
-								en_US: 'Thank Reviewer and Request Feedback',
+								en: 'Thank Reviewer and Request Feedback',
 							},
 						},
 					],
 					emailTemplatesApiUrl: 'http://example.org',
 					variables: {
-						en_US: [...insertContent],
+						en: [...insertContent],
 						fr_CA: [...insertContent],
 					},
-					locale: 'en_US',
+					locale: 'en',
 					locales: [
 						{
-							locale: 'en_US',
+							locale: 'en',
 							name: 'English',
 						},
 						{

src/docs/components/Form/fields/FieldBase/readme.md

@@ -16,7 +16,7 @@
 | `localeKey` | If the field `isMultilingual`, this will be set to the locale key of this particular instance. This is passed down from the `Form`. |
 | `primaryLocale` | The primary locale for this form. This is passed down from the `Form`. |
 | `locales` | The locales supported by this form. This is passed down from the `Form`. |
-| `showWhen` | The `name` of another field which should have a truthy value before this field is shown. You can also pass an array to require a specific value. For example, `['primaryLocale', 'en_US']` would hide this field unless the `primaryLocale` field had a value of `en_US`. |
+| `showWhen` | The `name` of another field which should have a truthy value before this field is shown. You can also pass an array to require a specific value. For example, `['primaryLocale', 'en']` would hide this field unless the `primaryLocale` field had a value of `en`. |
 | `value` | The current value. |
 | `allErrors` | An object containing all errors in the form. This is passed down from the `Form`. |
 

src/docs/components/Form/fields/FieldText/previews/PreviewFieldTextInline.vue

@@ -4,7 +4,7 @@
 		label="Title:"
 		:is-label-inline="true"
 		size="large"
-		localeKey="en_US"
+		localeKey="en"
 		@change="change"
 	/>
 </template>

src/docs/components/Form/helpers/field-base.js

@@ -2,7 +2,7 @@ export default {
 	groupId: 'default',
 	formId: 'default',
 	isRequired: false,
-	primaryLocale: 'en_US',
-	locales: ['en_US'],
+	primaryLocale: 'en',
+	locales: ['en'],
 	allErrors: {},
 };

src/docs/components/Form/helpers/field-options-user-locales.js

@@ -9,15 +9,15 @@ export default {
 	value: [],
 	options: [
 		{
-			value: 'en_US',
+			value: 'en',
 			label: 'English',
 		},
 		{
 			value: 'fr_CA',
 			label: 'French',
 		},
 		{
-			value: 'ar_AR',
+			value: 'ar',
 			label: 'عربى',
 		},
 	],

src/docs/components/Form/helpers/field-rich-textarea-abstract.js

@@ -7,10 +7,10 @@ export default {
 	plugins: 'paste,link,noneditable',
 	toolbar: 'bold italic superscript subscript | link',
 	value: {
-		en_US:
+		en:
 			'<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>',
 		fr_CA: '',
-		ar_AR: '',
+		ar: '',
 	},
 	isMultilingual: true,
 	wordCountLabel: 'Word Count: {$count}/{$limit}',

src/docs/components/Form/helpers/field-rich-textarea-bio.js

@@ -8,9 +8,9 @@ export default {
 	tooltip:
 		'Your biographical statement will usually include your department and rank, and may include research interests or key publications.',
 	value: {
-		en_US: '',
+		en: '',
 		fr_CA: '',
-		ar_AR: '',
+		ar: '',
 	},
 	isMultilingual: true,
 };