Skip to content

Commit

Permalink
feat: update en i18n and ui on venue
Browse files Browse the repository at this point in the history
  • Loading branch information
baby230211 committed Jul 22, 2023
1 parent 268e12b commit e700bf4
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 24 deletions.
5 changes: 3 additions & 2 deletions components/venue/VenueDivision.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
white-space: nowrap;
color: #9387ff;
&>>>h3 {
& >>> h3 {
padding: 0 14px;
position: relative;
display: flex;
Expand Down Expand Up @@ -65,4 +65,5 @@ export default {
border-top: 1px solid #9387ff;
display: inline-block;
}
}</style>
}
</style>
30 changes: 24 additions & 6 deletions components/venue/VenueDriveTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,37 @@ export default {
components: { VenueDivision },
data() {
return {
icon: {
parkingInfo: {
car: '人社館地下室設有汽車停車場,車輛進入院區持證件向大門警衛換證後可駛入院區,停車費用每小時20元。',
},
}
},
computed: {
icon() {
if (this.$i18n.locale === 'en-us') {
return {
car: require('~/static/img/venue/car.svg'),
carWhite: require('~/static/img/venue/car-white.svg'),
motorWhite: require('~/static/img/venue/motor-white.svg'),
parking: require('~/static/img/venue/parking.svg'),
parkingPink: require('~/static/img/venue/parking-pink.svg'),
venueDestination: require('~/static/img/venue/en-us/venue-destination.svg'),
venueDestinationMd: require('~/static/img/venue/en-us/venue-destination-md.svg'),
}
}
return {
car: require('~/static/img/venue/car.svg'),
carWhite: require('~/static/img/venue/car-white.svg'),
motorWhite: require('~/static/img/venue/motor-white.svg'),
parking: require('~/static/img/venue/parking.svg'),
parkingPink: require('~/static/img/venue/parking-pink.svg'),
venueDestination: require('~/static/img/venue/venue-destination.svg'),
venueDestinationMd: require('~/static/img/venue/venue-destination-md.svg'),
},
parkingInfo: {
car: '人社館地下室設有汽車停車場,車輛進入院區持證件向大門警衛換證後可駛入院區,停車費用每小時20元。',
},
}
}
},
},
mounted() {
console.log(this.$i18n.locale)
},
}
</script>
Expand Down
44 changes: 39 additions & 5 deletions components/venue/VenuePublicTransporterTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</div>

<VenueDivision>
<h3>
<h3 class="whitespace-normal">
<img class="mr-1" :src="icon.airplane" />
{{ $t('publicTransport.title') }}
</h3>
Expand Down Expand Up @@ -136,7 +136,23 @@
</ul>
</li>
<li>
{{ $t('publicTransportInfo.description3') }}
{{ $t('publicTransportInfo.description3.title') }}
<ul class="ml-[19px] list-outside list-disc">
<li>
{{
$t(
'publicTransportInfo.description3.info1',
)
}}
</li>
<li>
{{
$t(
'publicTransportInfo.description3.info2',
)
}}
</li>
</ul>
</li>
<li>
{{ $t('publicTransportInfo.description4') }}
Expand Down Expand Up @@ -202,7 +218,25 @@ export default {
i18nLinkPath: 'publicTransport.uBikePark.parkPlace.park5',
},
],
icon: {
}
},
computed: {
icon() {
if (this.$i18n.locale === 'en-us') {
return {
carWhite: require('~/static/img/venue/car-white.svg'),
busWhite: require('~/static/img/venue/bus-white.svg'),
publicTransporterGuide: require('~/static/img/venue/en-us/publicTransporterGuide.svg'),
publicTransporterGuideMd: require('~/static/img/venue/en-us/publicTransporterGuide-md.svg'),
taxiWhite: require('~/static/img/venue/taxi-white.svg'),
transporterWhite: require('~/static/img/venue/transporter-white.svg'),
uBike: require('~/static/img/venue/uBike.svg'),
parking: require('~/static/img/venue/parking.svg'),
airplane: require('~/static/img/venue/airplane.svg'),
}
}
return {
carWhite: require('~/static/img/venue/car-white.svg'),
busWhite: require('~/static/img/venue/bus-white.svg'),
publicTransporterGuide: require('~/static/img/venue/publicTransporterGuide.svg'),
Expand All @@ -212,8 +246,8 @@ export default {
uBike: require('~/static/img/venue/uBike.svg'),
parking: require('~/static/img/venue/parking.svg'),
airplane: require('~/static/img/venue/airplane.svg'),
},
}
}
},
},
}
</script>
Expand Down
61 changes: 50 additions & 11 deletions i18n/venue/index.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ export default genI18nMessages({
title: 'Parking Info',
car: {
title: 'Car',
parkingPlace: 'Humanities and Social Science Building (HSSB)',
description:
'The underground parking lot (B2) in the Humanities and Social Science Building is available for cars. ' +
'The underground parking lot (B2) in the {0} is available for cars. ' +
'Upon entering the campus, drivers should present their identification to the main gate security guard' +
' and obtain a parking permit. The parking fee is NT$20 per hour.',
},
Expand All @@ -63,6 +64,11 @@ export default genI18nMessages({
' Based on past experience, many people choose this option,' +
' so sharing a taxi from the MRT station is a good idea.',
},
bus: {
title: 'Passenger bus',
description:
"To reach Academia Sinica, you can take buses 205, 212, 212 直 (212 Express), 270, 270 區 (270 Shuttle), 276, 306, 306 區 (306 Shuttle), 620, 645, 645 副 (645 Sub), S1, S12, 小 12 區 (S12 Shuttle), S5, or 藍 25 (Blue 25), and get off at Academia Sinica Station. From there, it's approximately an 8-minute walk to your destination.",
},
uBike: {
link: {
description1: 'official YouBike website',
Expand All @@ -74,25 +80,54 @@ export default genI18nMessages({
'It is recommended to check the available docking stations on the app to return the bike. {2}' +
'Cycling time from Nangang Station or Nangang Exhibition Center Station to Academia Sinica is approximately 10-15 minutes',
},
uBikePark: {
parkPlace: {
park1: 'YouBike 2.0: Humanities and Social Science Building',
park2: 'YouBike 2.0: Academia Sinica Gymnasium (East)',
park3: 'YouBike 2.0: Academia Sinica (Jiuzhuang St. Intersection)',
park4: 'YouBike 2.0: Academia Park',
park5: 'YouBike 2.0: Dr. Hu Shih Par',
},
parkingInfo: {
park1: '{0}',
park2: '{0}',
park3: '{0} — Approximately a 10-minute walk',
park4: '{0} — Approximately a 12-minute walk',
park5: '{0} — Approximately a 13-minute walk',
},
title: 'Youbike 附近租賃站點',
},
},
publicTransportInfo: {
title: 'Way of Transportation',
title: 'Public transportation',
info:
'You can take the Kuo-Kuang Bus 1843 to travel between Nangang Exhibition' +
'You can take the {0} to travel between Nangang Exhibition' +
' Center and Terminal 1 and Terminal 2 of Taoyuan International Airport.',
'1843infoTitle': 'Kuo-Kuang Bus 1843 Route Information:',
'1843infoTitle': '{0} Route Information:',
publicTransport: 'Kuo-Kuang Bus 1843',

description1:
'Route: Taiwan Taoyuan Airport Terminal 1 ->' +
' Taiwan Taoyuan Airport Terminal 2 -> MRT Gangqian Station' +
' -> Ruiguang Road -> Neihu Administrative Center ->' +
' MRT Nangang Exhibition Center Station (Nangang Rd.) -> Nangang Bus Station (West)',
description2:
'Bus platform location: Terminal I: B1 bus area of' +
' Arrivals Hall Terminal II: Outdoor gallery at East side of 1F Arrivals Hall',
description3:
'Fare (for reference only):Full Fare: NT$140,Half Fare: NT$75',
description4: 'Schedule: 09:10, 13:10, and 17:20',
description2: {
title: 'Bus platform location:',
info1: 'Terminal I: B1 bus area of Arrivals Hall',
info2: 'Terminal II: Outdoor gallery at East side of 1F Arrivals Hall',
},
description3: {
title: 'Fare (for reference only):',
info1: 'Fare: NT$140',
info2: 'Fare: NT$75',
},
description4: 'Schedule: 09:10, 13:10, and 17:20, From Terminal II',
description5: 'Estimated time: 1 hour with moderate traffic',
moreInfo: {
title: 'For more information, please refer to {0} and {1} 。',
info1: 'the traffic information of Academia Sinica',
info2: 'the public transportation information of Taoyuan international Airport',
},
},
},
'zh-hant': {
Expand Down Expand Up @@ -197,7 +232,11 @@ export default genI18nMessages({
info1: '第一航廈:B1 層巴士乘車區。',
info2: '第二航廈:1F 層巴士乘車區。',
},
description3: '票價(票價僅供參考):全票 NT$140,半票 NT$75',
description3: {
title: '票價(票價僅供參考):',
info1: '全票 NT$140',
info2: '半票 NT$75',
},
description4: '時間:09:10、13:10、17:20,從第二航廈發車',
description5: '路程時間:一般交通狀況下一小時',
moreInfo: {
Expand Down
9 changes: 9 additions & 0 deletions static/img/venue/en-us/publicTransporterGuide-md.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions static/img/venue/en-us/publicTransporterGuide.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions static/img/venue/en-us/venue-destination-md.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions static/img/venue/en-us/venue-destination.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e700bf4

Please sign in to comment.