Skip to content

Commit

Permalink
makes text changes to front page
Browse files Browse the repository at this point in the history
  • Loading branch information
ajrothwell committed May 3, 2024
1 parent e3245f8 commit 281dd0b
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev_push_to_s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: dev Push to S3
on:
push:
branches:
- add-translations_x
- add-translations

jobs:
build:
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions src/components/ExpandCollapseContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,27 @@ export default {
},
},
},
computed: {
i18nLocale() {
return this.$i18n.locale;
},
},
methods: {
parseAddress(address) {
const formattedAddress = address.replace(/(Phila.+)/g, city => `<div>${city}</div>`).replace(/^\d+\s[A-z]+\s[A-z]+/g, lineOne => `<div>${lineOne}</div>`).replace(/,/, '');
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 = `<a href="${legalLink}" target="_blank">${list[i]}<i class='fa fa-external-link-alt'></i></a>`;
let link = `<a href="${legalLink}" target="_blank">${this.$i18n.messages[this.i18nLocale][list[i]]}<i class='fa fa-external-link-alt'></i></a>`;
formattedService.push(link);
} else {
formattedService.push(list[i]);
formattedService.push(this.$i18n.messages[this.i18nLocale][list[i]]);
}
}
Expand Down
13 changes: 10 additions & 3 deletions src/components/customGreeting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
class="main-area"
>
<div class="greeting-section">
<h3>
<!-- <h3>
{{ $t('introPage.section1Title') }}
</h3>
</h3> -->

<p v-html="$t('introPage.p0')" />

Expand Down Expand Up @@ -43,7 +43,14 @@
{{ $t('introPage.section3Title') }}
</h3>

<p v-html="$t('introPage.p3')" />
<p v-html="$t('introPage.p3_1')" />
<p v-html="$t('introPage.p3_2')" />

<h3>
{{ $t('introPage.section4Title') }}
</h3>

<p v-html="$t('introPage.p4')" />
</div>
</div> <!-- end of main-area -->
</div>
Expand Down
7 changes: 5 additions & 2 deletions src/i18n/en-us.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a target='_blank' href='https://www.phila.gov/departments/office-of-immigrant-affairs/'>Office of Immigrant Affairs</a> maintains this website. You can contact us at <a target='_blank' href='mailto:[email protected]'>[email protected]</a> 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 <a href='https://www.phila.gov/oia/resource-finder/?services=Legal%20services'>free, safe legal services.</a>",
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, <a target='_blank' href='https://www.phila.gov/services/property-lots-housing/submit-a-service-request-with-311/'>contact 311</a>.",
section4Title: "Adding your organization to the list",
p4: "The <a target='_blank' href='https://www.phila.gov/departments/office-of-immigrant-affairs/'>Office of Immigrant Affairs</a> maintains this website. Contact us at <a target='_blank' href='mailto:[email protected]'>[email protected]</a> if you offer immigrant services and would like to be added to this list.",
},
'Arts & culture': 'Arts & culture',
'Citizenship application help': 'Citizenship application help',
Expand Down
7 changes: 5 additions & 2 deletions src/i18n/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a target='_blank' href='https://www.phila.gov/departments/office-of-immigrant-affairs/'>Office of Immigrant Affairs</a> maintains this website. You can contact us at <a target='_blank' href='mailto:[email protected]'>[email protected]</a> 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, <a target='_blank' href='https://www.phila.gov/services/property-lots-housing/submit-a-service-request-with-311/'>contact 311.</a>",
section4Title: "Spanish Adding your organization to the list",
p4: "Spanish The <a target='_blank' href='https://www.phila.gov/departments/office-of-immigrant-affairs/'>Office of Immigrant Affairs</a> maintains this website. You can contact us at <a target='_blank' href='mailto:[email protected]'>[email protected]</a> 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',
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 281dd0b

Please sign in to comment.