diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml index c855492..b461d07 100644 --- a/.github/workflows/dev_push_to_s3.yml +++ b/.github/workflows/dev_push_to_s3.yml @@ -6,7 +6,7 @@ name: dev Push to S3 on: push: branches: - - add-translations_x + - add-translations jobs: build: diff --git a/package-lock.json b/package-lock.json index dba9b6c..bf49fa7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1179,7 +1179,7 @@ }, "@fortawesome/fontawesome-svg-core": { "version": "1.2.36", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/1.2.36/fontawesome-svg-core-1.2.36.tgz", "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", "requires": { "@fortawesome/fontawesome-common-types": "^0.2.36" @@ -1187,7 +1187,7 @@ }, "@fortawesome/free-brands-svg-icons": { "version": "5.15.4", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-brands-svg-icons/-/5.15.4/free-brands-svg-icons-5.15.4.tgz", "integrity": "sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==", "requires": { "@fortawesome/fontawesome-common-types": "^0.2.36" @@ -1195,7 +1195,7 @@ }, "@fortawesome/free-regular-svg-icons": { "version": "5.15.4", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-regular-svg-icons/-/5.15.4/free-regular-svg-icons-5.15.4.tgz", "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==", "requires": { "@fortawesome/fontawesome-common-types": "^0.2.36" @@ -1203,7 +1203,7 @@ }, "@fortawesome/free-solid-svg-icons": { "version": "5.15.4", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-solid-svg-icons/-/5.15.4/free-solid-svg-icons-5.15.4.tgz", "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", "requires": { "@fortawesome/fontawesome-common-types": "^0.2.36" @@ -1235,7 +1235,7 @@ }, "@fortawesome/vue-fontawesome": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.5.tgz", + "resolved": "https://npm.fontawesome.com/@fortawesome/vue-fontawesome/-/2.0.5/vue-fontawesome-2.0.5.tgz", "integrity": "sha512-BktJiEuZhU+HxANJ37Pek6y+LRVVFgcU5CDd6b+t6XKj30QrYrh3ICsC5FQm5MuAdh3CPpYT99ywjk5v6nWteA==" }, "@hapi/address": { diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue index d0d8bc6..73c189f 100644 --- a/src/components/ExpandCollapseContent.vue +++ b/src/components/ExpandCollapseContent.vue @@ -148,6 +148,11 @@ export default { }, }, }, + computed: { + i18nLocale() { + return this.$i18n.locale; + }, + }, methods: { parseAddress(address) { @@ -155,15 +160,15 @@ export default { return formattedAddress; }, parseServiceList(list) { - console.log('parseServiceList:', list, 'this.item:', this.item); + console.log('parseServiceList:', list, 'this.item:', this.item, 'this.$i18n.messages:', this.$i18n.messages); let formattedService = []; for (let i in list) { if (list[i] === 'Legal services') { let legalLink = this.item.website_legal; - let link = `${list[i]}`; + let link = `${this.$i18n.messages[this.i18nLocale][list[i]]}`; formattedService.push(link); } else { - formattedService.push(list[i]); + formattedService.push(this.$i18n.messages[this.i18nLocale][list[i]]); } } diff --git a/src/components/customGreeting.vue b/src/components/customGreeting.vue index 77c008a..e204337 100644 --- a/src/components/customGreeting.vue +++ b/src/components/customGreeting.vue @@ -7,9 +7,9 @@ class="main-area" >
-

+

@@ -43,7 +43,14 @@ {{ $t('introPage.section3Title') }}

-

+

+

+ +

+ {{ $t('introPage.section4Title') }} +

+ +

diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js index 62a2a62..a2bc247 100644 --- a/src/i18n/en-us.js +++ b/src/i18n/en-us.js @@ -20,8 +20,11 @@ export default { }, section2Title: "Language access", p2: "Most locations offer most of their services in English. Other available languages vary by organization. To see the languages spoken at an organization, open that location's details.", - section3Title: "Adding your organization to the list", - p3: "The Office of Immigrant Affairs maintains this website. You can contact us at OIA@phila.gov if you offer immigrant services and would like to learn how to be added to this list.", + section3Title: "Immigration assistance and notario fraud", + p3_1: "Many of our partners listed here provide free, safe legal services.", + p3_2: "Beware of unlicensed immigration service providers who take advantage of their customers. In the United States, a notary is not allowed to give legal advice unless they are also a licensed attorney. To report fraud or complain about a provider, contact 311.", + section4Title: "Adding your organization to the list", + p4: "The Office of Immigrant Affairs maintains this website. Contact us at OIA@phila.gov if you offer immigrant services and would like to be added to this list.", }, 'Arts & culture': 'Arts & culture', 'Citizenship application help': 'Citizenship application help', diff --git a/src/i18n/es.js b/src/i18n/es.js index 63a07e6..80525cd 100644 --- a/src/i18n/es.js +++ b/src/i18n/es.js @@ -20,8 +20,11 @@ export default { }, section2Title: "Spanish Language access", p2: "Spanish Most locations offer most of their services in English. Other available languages vary by organization. To see the languages spoken at an organization, open that location's details.", - section3Title: "Spanish Adding your organization to the list", - p3: "Spanish The Office of Immigrant Affairs maintains this website. You can contact us at OIA@phila.gov if you offer immigrant services and would like to learn how to be added to this list.", + section3Title: "Spanish Immigration assistance and notario fraud", + p3_1: "Many of our partners listed here provide free, safe legal services.", + p3_2: "Beware of unlicensed immigration service providers who take advantage of their customers. In the United States, a notary is not allowed to give legal advice unless they are also a licensed attorney. To report fraud or complain about a provider, contact 311.", + section4Title: "Spanish Adding your organization to the list", + p4: "Spanish The Office of Immigrant Affairs maintains this website. You can contact us at OIA@phila.gov if you offer immigrant services and would like to learn how to be added to this list.", }, 'Arts & culture': 'Spanish Arts & culture', 'Citizenship application help': 'Spanish Citizenship application help', diff --git a/src/main.js b/src/main.js index f9a5563..9091bdd 100644 --- a/src/main.js +++ b/src/main.js @@ -36,7 +36,7 @@ const customComps = { }; import i18n from './i18n/i18n'; -console.log('main.js i18n:', i18n); +console.log('main.js i18n.i18n:', i18n.i18n); pinboard({ publicPath: process.env.VUE_APP_PUBLICPATH,