Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/kylerchin/catenary-frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
@kylerchin
kylerchin committed Jan 2, 2024
2 parents ed4b640 + b11bbbd commit 2ec799f
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 33 deletions.
75 changes: 63 additions & 12 deletions src/i18n/strings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ const i18n = {
en: {
search: 'Search',
// special
appwidealert: 'Happy New Year from Catenary!',
appwidesubtext: 'Time to ring in 2024! Remember to check your agency\'s schedules for holiday service.',
appwidealert: 'Customize your Catenary experience!',
appwidesubtext: 'Want to see buses or additional information on the map? Select the Layers menu in the top right corner.',
alertheadersd: 'What future programs do you think would improve public transit the most?',
alertsubtextsd: 'Take SANDAG’s survey by 1/2/24 and you can enter a sweepstakes to win a $50 Amazon gift card.',
alertheaderla: 'Your community, through the eyes of artists',
Expand Down Expand Up @@ -53,8 +53,8 @@ const i18n = {
fr: {
search: 'Rechercher',
// special
appwidealert: 'Bonne année de la part de Catenary!',
appwidesubtext: 'Il est temps de célébrer 2024! N\'oubliez pas de vérifier les horaires de votre agence pour le service des jours fériés.',
appwidealert: 'Personnalisez votre expérience Catenary!',
appwidesubtext: 'Vous voulez voir des bus ou des informations supplémentaires sur la carte? Sélectionnez le menu Layers dans le coin supérieur droit.',
alertheadersd: 'Quels programmes futurs pensez-vous qui amélioreraient le plus les transports en commun?',
alertsubtextsd: 'Répondez au sondage de SANDAG d\'ici le 2/1/24 et vous pourrez participer à un tirage au sort pour gagner une carte-cadeau Amazon de 50 $.',
alertheaderla: 'Voyez votre communauté à travers les yeux d\'artistes locaux',
Expand Down Expand Up @@ -104,8 +104,8 @@ const i18n = {
es: {
search: 'Buscar',
// special
appwidealert: '¡Feliz año nuevo del equipo Catenary!',
appwidesubtext: '¡Es hora de celebrar 2024! Recuerde verificar los horarios de su agencia para el servicio de vacaciones.',
appwidealert: '¡Personaliza tu experiencia Catenary!',
appwidesubtext: '¿Quieres ver autobuses o información adicional en el mapa? Seleccione el menú Capas en la esquina superior derecha.',
alertheadersd: '¿Qué programas futuros cree que mejorarían más el transporte público?',
alertsubtextsd: 'Responda la encuesta de SANDAG antes del 2 de enero del 2024 y entrará en un sorteo para ganar una tarjeta de regalo de Amazon de $50.',
alertheaderla: 'Vea su comunidad a través de los ojos de artistas locales',
Expand Down Expand Up @@ -152,11 +152,62 @@ const i18n = {
coordscopied: "Coords copiadas al portapapeles",
showFPS: "Mostrar fps"
},
de: {
search: 'Suche',
// special
appwidealert: 'Passen Sie Ihr Catenary-Erlebnis an!',
appwidesubtext: 'Möchten Sie Busse oder zusätzliche Informationen auf der Karte sehen? Wählen Sie das Menü Ebenen in der oberen rechten Ecke.',
alertheadersd: 'Welche zukünftigen Programme würden Ihrer Meinung nach den öffentlichen Nahverkehr am meisten verbessern?',
alertsubtextsd: 'Nehmen Sie an der Umfrage von SANDAG bis zum 2. Januar 2024 teil und Sie können an einer Verlosung für einen 50 $ Amazon-Gutschein teilnehmen.',
alertheaderla: 'Sehen Sie Ihre Gemeinde durch die Augen lokaler Künstler',
alertsubtextla: 'Feiern Sie 20 Jahre Metro Art\'s Through the Eyes of Artists Serie!',
learnmore: 'Erfahren Sie mehr',
// art
art: 'Öffentliche Kunst',
// settings
settings: 'Einstellungen',
useUSunits: 'US-Einheiten verwenden',
showtripless: 'Fahrzeuge ohne Fahrten anzeigen',
language: 'Sprache',
mapstyle: 'Kartenstil',
styledefault: 'Standard',
styleclassic: 'Klassisch',
stylearchi: 'Archi',
stylesat: 'Satellit',
styleminimal: 'Minimal',
// layers
headingRail: 'Schienen/Sonstiges',
headingBus: 'Busse',
headingLocalRail: 'Metro/Straßenbahn',
headingIntercityRail: 'Schienen',
headingOther: 'Andere',
headingMisc: 'Verschiedenes',
routes: 'Routen',
labels: 'Etiketten',
stops: 'Haltestellen',
stopnames: 'Namen',
vehicles: 'Fahrzeuge',
showroute: 'Route',
showtrip: 'Reise',
showvehicle: 'Fahrzeug',
showspeed: 'Geschwindigkeit',
// foamer layers
orminfra: 'Infrastruktur',
ormspeeds: 'Maximale Geschwindigkeiten',
ormsignalling: 'Signalisierung',
ormelectrification: 'Elektrifizierung',
ormgauge: 'Spurweite',
// announcements
announcements: 'Zufällige Ankündigungen abspielen',
coordsview: "Ansicht",
coordscopied: "Koordinaten in die Zwischenablage kopiert",
showFPS: "FPS anzeigen"
},
ko: {
search: '검색',
// special
appwidealert: 'Catenary 팀에서 새해 복 많이 받으세요!',
appwidesubtext: '2024년을 맞이하며, 휴일 운행에 대한 정보는 해당 운영기관의 홈페이지를 참고하시기 바랍니다.',
appwidealert: 'Catenary 경험을 사용자 정의하십시오!',
appwidesubtext: '지도에서 버스 또는 추가 정보를 보고 싶습니까? 오른쪽 상단 모서리에있는 레이어 메뉴를 선택하십시오.',
alertheadersd: '대중 교통을 가장 개선할 것으로 생각되는 미래 프로그램은 무엇입니까?',
alertsubtextsd: 'SANDAG의 설문 조사에 1/2/24까지 참여하면 50 달러의 아마존 상품권을 받을 수있는 추첨에 참여 할 수 있습니다.',
alertheaderla: '지역 예술가의 눈으로 지역 사회를 보세요',
Expand Down Expand Up @@ -207,8 +258,8 @@ const i18n = {
zh_TW: {
search: '查詢',
// special
appwidealert: 'Catenary 的開發隊祝您節日愉快！',
appwidesubtext: '無論您的假日計畫是什麼，我們都會提供您服務。節日班車往往會有變化，請您參考當地的交通資訊。',
appwidealert: '自訂您的 Catenary 體驗！',
appwidesubtext: '想在地圖上看到巴士或其他資訊？請選擇右上角的圖層選單。',
alertheadersd: '您覺得什麼樣的未來發展會對公共交通最友善？',
alertsubtextsd: '在 1月2日2024年 前參加 SANDAG 的問卷，就可獲得一次抽獎 $50 美元亞馬遜禮物卡的機會。',
alertheaderla: '看藝術家的眼中的社區',
Expand Down Expand Up @@ -258,8 +309,8 @@ const i18n = {
zh_CN: {
search: '查询',
// special
appwidealert: 'Catenary 的开发队祝您节日愉快！',
appwidesubtext: '无论您的假日计划是什么，我们都会提供您服务。节日班车往往会有变化，请您参考当地的交通资讯。',
appwidealert: '自定义您的 Catenary 体验！',
appwidesubtext: '想在地图上看到巴士或其他信息？请选择右上角的图层选单。',
alertheadersd: '您觉得什么样的未来发展会对公共交通最友善？',
alertsubtextsd: '在 1月2日2024年 前参加 SANDAG 的问卷，就可获得一次抽奖 $50 美元亚马逊礼物卡的机会。',
alertheaderla: '看艺术家的眼中的社区',
Expand Down
43 changes: 22 additions & 21 deletions src/routes/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,11 @@
let layersettings: any = {
bus: {
visible: true,
labelshapes: true,
stops: true,
shapes: true,
stoplabels: true,
visible: false,
labelshapes: false,
stops: false,
shapes: false,
stoplabels: false,
label: {
route: true,
trip: false,
Expand All @@ -269,11 +269,11 @@
localrail: {
visible: true,
stops: true,
labelshapes: true,
stoplabels: true,
labelshapes: false,
stoplabels: false,
shapes: true,
label: {
route: true,
route: false,
trip: false,
vehicle: false,
headsign: false,
Expand All @@ -284,26 +284,26 @@
intercityrail: {
visible: true,
stops: true,
labelshapes: true,
stoplabels: true,
labelshapes: false,
stoplabels: false,
shapes: true,
label: {
route: true,
trip: true,
route: false,
trip: false,
vehicle: false,
headsign: false,
direction: false,
speed: true
speed: false
}
},
other: {
visible: true,
stops: true,
labelshapes: true,
stoplabels: true,
shapes: true,
visible: false,
stops: false,
labelshapes: false,
stoplabels: false,
shapes: false,
label: {
route: true,
route: false,
trip: false,
vehicle: false,
headsign: false,
Expand Down Expand Up @@ -2165,8 +2165,8 @@ on:keydown={() => {
>
<div class="mt-16"></div>
{#if sidebarView == 0}
<Alertpopup background="linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0.6)), url(https://art.metro.net/wp-content/uploads/2021/08/featured-highlandpark-1200x800-1.jpeg) top center no-repeat, black">
<h1 class="text-lg font-bold">{strings.appwidealert}</h1>
<Alertpopup background="linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0.6)), url(https://art.metro.net/wp-content/uploads/2022/12/Victoria-Fu-Matt-Rich-Untitled-DetailB.png) center center no-repeat, black">
<h1 class="text-md text-bold">{strings.appwidealert}</h1>
<p class="text-sm">{strings.appwidesubtext}</p>
</Alertpopup>
{#if realtime_list.includes('f-metro~losangeles~bus~rt')}
Expand Down Expand Up @@ -2263,6 +2263,7 @@ on:keydown={() => {
<option value="en">English</option>
<option value="fr">Français</option>
<option value="es">Español</option>
<option value="de">Deutsch</option>
<option value="ko">한국어</option>
<option value="zh_CN">简体中文</option>
<option value="zh_TW">繁體中文</option>
Expand Down

0 comments on commit 2ec799f

Please sign in to comment.