[WIP] Deduct home-office distance from valid requests when enabled - #100189
Draft
Gonals wants to merge 5 commits into
Draft
[WIP] Deduct home-office distance from valid requests when enabled#100189Gonals wants to merge 5 commits into
Gonals wants to merge 5 commits into
Conversation
Contributor
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 6791f86a..89224027 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8991,13 +8991,10 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ zu verbotenen Ausgaben hinzugefügt`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `„${prohibitedExpense}“ aus verbotenen Ausgaben entfernt`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `Ausschluss von Arbeitswegen in eine feste Entfernung pro Abrechnung geändert (zuvor ${previousMethod})`,
- changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `Ausschluss von Arbeitswegen in Berechnung nach Wohn- und Büroadresse geändert (zuvor ${previousMethod})`,
- previousMethod: {
- disabled: 'Arbeitswege nicht ausschließen',
- fixedDistance: 'feste Entfernung pro Abrechnung',
- homeAndOffice: 'Wohn- und Büroadresse',
- },
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
+ `Ausschluss von Pendelstrecken in eine feste Entfernung pro Abrechnung geändert (zuvor ${previousMethod})`,
+ changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `Ausschluss von Arbeitswegen geändert zu Berechnung nach Wohnort und Büro (zuvor ${previousMethod})`,
+ previousMethod: {disabled: 'Pendelfahrten nicht ausschließen', fixedDistance: 'Feste Entfernung pro Antrag', homeAndOffice: 'Zuhause und Büro'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `feste Entfernungsausschlussgrenze von ${formattedDistance} pro Abrechnung festlegen`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`Feste Streckenausschlussgrenze auf ${formattedNewDistance} pro Antrag geändert (zuvor ${formattedOldDistance})`,
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 843b956a..bbd34945 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9121,14 +9121,11 @@ ${reportName}`,
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `προστέθηκε το "${prohibitedExpense}" στις απαγορευμένες δαπάνες`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `αφαιρέσατε το «${prohibitedExpense}» από τις απαγορευμένες δαπάνες`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `άλλαξε την εξαίρεση μετακινήσεων σε σταθερή απόσταση ανά αίτημα (προηγουμένως ${previousMethod})`,
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
+ `άλλαξε τον αποκλεισμό μετακινήσεων από/προς την εργασία σε σταθερή απόσταση ανά αίτημα (προηγουμένως ${previousMethod})`,
changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) =>
- `άλλαξε τον υπολογισμό εξαίρεσης μετακινήσεων βάσει κατοικίας και γραφείου (προηγουμένως ${previousMethod})`,
- previousMethod: {
- disabled: 'να μην εξαιρούνται οι μετακινήσεις',
- fixedDistance: 'σταθερή απόσταση ανά αίτημα',
- homeAndOffice: 'κατοικία και γραφείο',
- },
+ `άλλαξε τον υπολογισμό εξαίρεσης μετακινήσεων ώστε να γίνεται με βάση το σπίτι και το γραφείο (προηγουμένως ${previousMethod})`,
+ previousMethod: {disabled: 'να μην εξαιρούνται οι μετακινήσεις προς/από την εργασία', fixedDistance: 'σταθερή απόσταση ανά αίτημα', homeAndOffice: 'σπίτι και γραφείο'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `ορίστε σταθερό αποκλεισμό απόστασης σε ${formattedDistance} ανά αίτημα`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`άλλαξε τον αποκλεισμό σταθερής απόστασης σε ${formattedNewDistance} ανά αίτημα (προηγουμένως ${formattedOldDistance})`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index df62ea7d..e3d76b88 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8780,13 +8780,9 @@ ${reportName}`,
removedProhibitedExpense: ({prohibitedExpense}) => `eliminó "${prohibitedExpense}" de los gastos prohibidos`,
commuterExclusions: {
changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
- `cambió la exclusión de desplazamientos a una distancia fija por solicitud (previamente ${previousMethod})`,
- changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `cambió la exclusión de desplazamientos a calcular por casa y oficina (previamente ${previousMethod})`,
- previousMethod: {
- disabled: 'no excluir desplazamientos',
- fixedDistance: 'distancia fija por solicitud',
- homeAndOffice: 'casa y oficina',
- },
+ `cambió la exclusión de desplazamientos a una distancia fija por reclamación (previamente ${previousMethod})`,
+ changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `cambió la exclusión de desplazamientos para calcular por casa y oficina (previamente ${previousMethod})`,
+ previousMethod: {disabled: 'no excluir desplazamientos al trabajo', fixedDistance: 'distancia fija por solicitud', homeAndOffice: 'casa y oficina'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `establecer exclusión de distancia fija en ${formattedDistance} por reclamación`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`cambió la exclusión de distancia fija a ${formattedNewDistance} por reclamación (previamente ${formattedOldDistance})`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 55d6c643..36cad018 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9020,14 +9020,10 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `a supprimé « ${prohibitedExpense} » des dépenses interdites`,
commuterExclusions: {
changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
- `a modifié l’exclusion des trajets domicile-travail en une distance fixe par demande (auparavant ${previousMethod})`,
+ `a modifié « exclure les trajets domicile-travail » en une distance fixe par demande (auparavant ${previousMethod})`,
changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) =>
- `a modifié l’exclusion des trajets domicile-travail en un calcul selon le domicile et le bureau (auparavant ${previousMethod})`,
- previousMethod: {
- disabled: 'ne pas exclure les trajets domicile-travail',
- fixedDistance: 'distance fixe par demande',
- homeAndOffice: 'domicile et bureau',
- },
+ `a modifié l’exclusion des trajets domicile-travail pour calculer à partir du domicile et du bureau (précédemment ${previousMethod})`,
+ previousMethod: {disabled: 'ne pas exclure les trajets domicile-travail', fixedDistance: 'distance fixe par demande', homeAndOffice: 'domicile et bureau'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `définir l’exclusion de distance fixe à ${formattedDistance} par demande`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`a modifié l'exclusion de distance fixe à ${formattedNewDistance} par demande (auparavant ${formattedOldDistance})`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 17720b3a..cc2b38e3 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8952,14 +8952,10 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `ha rimosso "${prohibitedExpense}" dalle spese vietate`,
commuterExclusions: {
changedToFixedDistance: ({previousMethod}: {previousMethod: string}) =>
- `ha modificato "escludi tragitti casa-lavoro" in "distanza fissa per richiesta" (in precedenza ${previousMethod})`,
+ `ha cambiato “escludi tragitti casa-lavoro” in una distanza fissa per rimborso (in precedenza ${previousMethod})`,
changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) =>
- `ha modificato "escludi tragitti casa-lavoro" in "calcola in base a casa e ufficio" (in precedenza ${previousMethod})`,
- previousMethod: {
- disabled: 'non escludere i tragitti casa-lavoro',
- fixedDistance: 'distanza fissa per richiesta',
- homeAndOffice: 'casa e ufficio',
- },
+ `ha cambiato l’esclusione dei tragitti casa-lavoro per calcolare in base a casa e ufficio (in precedenza ${previousMethod})`,
+ previousMethod: {disabled: 'non escludere i tragitti casa-lavoro', fixedDistance: 'distanza fissa per richiesta', homeAndOffice: 'casa e ufficio'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `imposta un'esclusione fissa di distanza di ${formattedDistance} per richiesta`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`ha modificato l’esclusione a distanza fissa a ${formattedNewDistance} per richiesta (in precedenza ${formattedOldDistance})`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index d007f9bd..a7ca1a9d 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8828,13 +8828,9 @@ ${reportName}`,
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `禁止経費に「${prohibitedExpense}」を追加しました`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `禁止経費から「${prohibitedExpense}」を削除しました`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `通勤分を除外する設定を、申請ごとの固定距離に変更しました（以前は${previousMethod}）`,
- changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `通勤分を除外する設定を、自宅と勤務先から計算に変更しました（以前は${previousMethod}）`,
- previousMethod: {
- disabled: '通勤分を除外しない',
- fixedDistance: '申請ごとの固定距離',
- homeAndOffice: '自宅と勤務先',
- },
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `通勤除外方法を、申請ごとに一定距離に変更しました（以前の方法：${previousMethod}）`,
+ changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `自宅とオフィスを基準に計算するように通勤を除外する設定を変更しました（以前の方法：${previousMethod}）`,
+ previousMethod: {disabled: '通勤を除外しない', fixedDistance: '申請ごとの固定距離', homeAndOffice: '自宅とオフィス'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `請求ごとに固定距離の除外を ${formattedDistance} に設定します`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`1件あたりの固定距離控除を${formattedNewDistance}に変更しました（以前は${formattedOldDistance}）`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 3825898a..b4c28663 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8919,14 +8919,10 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft ‘${prohibitedExpense}’ toegevoegd aan verboden uitgaven`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `heeft „${prohibitedExpense}” verwijderd uit verboden uitgaven`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `wijzigde woon-werkverkeer uitsluiten naar een vaste afstand per declaratie (voorheen ${previousMethod})`,
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `heeft woon-werkverkeer wijzigen naar een vaste afstand per declaratie (voorheen ${previousMethod})`,
changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) =>
- `wijzigde woon-werkverkeer uitsluiten naar berekenen op basis van woon- en werkadres (voorheen ${previousMethod})`,
- previousMethod: {
- disabled: 'woon-werkverkeer niet uitsluiten',
- fixedDistance: 'vaste afstand per declaratie',
- homeAndOffice: 'woon- en werkadres',
- },
+ `methode voor woon-werkverkeer uitsluiten gewijzigd naar berekenen op basis van thuis en kantoor (voorheen ${previousMethod})`,
+ previousMethod: {disabled: 'woon-werkverkeer niet uitsluiten', fixedDistance: 'vaste afstand per declaratie', homeAndOffice: 'thuis en kantoor'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `stel vaste afstandsuitsluiting in op ${formattedDistance} per declaratie`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`vaste afstandsuitsluiting gewijzigd naar ${formattedNewDistance} per declaratie (voorheen ${formattedOldDistance})`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 27c098f4..fea6deca 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8940,13 +8940,9 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `dodano „${prohibitedExpense}” do zabronionych wydatków`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `usunięto „${prohibitedExpense}” z wydatków zabronionych`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `zmieniono wykluczanie dojazdów na stałą odległość na zgłoszenie (wcześniej ${previousMethod})`,
- changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `zmieniono wykluczanie dojazdów na obliczanie na podstawie domu i biura (wcześniej ${previousMethod})`,
- previousMethod: {
- disabled: 'nie wykluczaj dojazdów',
- fixedDistance: 'stała odległość na zgłoszenie',
- homeAndOffice: 'dom i biuro',
- },
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `zmieniono wykluczanie dojazdów na stały dystans na zgłoszenie (wcześniej ${previousMethod})`,
+ changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `zmieniono wykluczanie dojazdów na obliczanie względem domu i biura (wcześniej ${previousMethod})`,
+ previousMethod: {disabled: 'nie wykluczaj dojazdów', fixedDistance: 'stała odległość na zgłoszenie', homeAndOffice: 'dom i biuro'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `ustaw stałe wyłączenie dystansu na ${formattedDistance} na zgłoszenie`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`zmieniono stałe wykluczenie odległości na ${formattedNewDistance} na zgłoszenie (wcześniej ${formattedOldDistance})`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 3d6fe8c7..2ec1ee62 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8922,13 +8922,9 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `adicionou "${prohibitedExpense}" às despesas proibidas`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `removeu "${prohibitedExpense}" das despesas proibidas`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `alterou a exclusão de deslocamentos para uma distância fixa por solicitação (antes ${previousMethod})`,
- changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `alterou a exclusão de deslocamentos para cálculo por casa e escritório (antes ${previousMethod})`,
- previousMethod: {
- disabled: 'não excluir deslocamentos',
- fixedDistance: 'distância fixa por solicitação',
- homeAndOffice: 'casa e escritório',
- },
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `alterou excluir deslocamentos para uma distância fixa por solicitação (antes: ${previousMethod})`,
+ changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `alterou "excluir deslocamentos" para calcular por casa e escritório (anteriormente ${previousMethod})`,
+ previousMethod: {disabled: 'não excluir trajetos de ida e volta', fixedDistance: 'distância fixa por solicitação', homeAndOffice: 'casa e escritório'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `definir exclusão de distância fixa para ${formattedDistance} por solicitação`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`alterou a exclusão de distância fixa para ${formattedNewDistance} por reembolso (antes ${formattedOldDistance})`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 28dc1db5..937dd802 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8600,13 +8600,9 @@ ${reportName}`,
addedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已将“${prohibitedExpense}”添加到禁止报销的费用中`,
removedProhibitedExpense: ({prohibitedExpense}: {prohibitedExpense: string}) => `已从禁用报销类别中移除“${prohibitedExpense}”`,
commuterExclusions: {
- changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `已将“排除通勤”更改为“每次报销按固定距离计算”（之前为${previousMethod}）`,
- changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `已将“排除通勤”更改为“按住址和办公地点计算”（之前为${previousMethod}）`,
- previousMethod: {
- disabled: '不排除通勤',
- fixedDistance: '每次报销按固定距离计算',
- homeAndOffice: '住址和办公地点',
- },
+ changedToFixedDistance: ({previousMethod}: {previousMethod: string}) => `将“排除通勤”方式更改为按每次报销计算固定距离（之前为 ${previousMethod}）`,
+ changedToHomeAndOffice: ({previousMethod}: {previousMethod: string}) => `已将排除通勤的计算方式更改为按家庭和办公室计算（之前为 ${previousMethod}）`,
+ previousMethod: {disabled: '不要排除通勤', fixedDistance: '每次报销的固定距离', homeAndOffice: '家庭和办公室'},
setFixedDistance: ({formattedDistance}: {formattedDistance: string}) => `将每次报销的固定距离排除设置为 ${formattedDistance}`,
changedFixedDistance: ({formattedOldDistance, formattedNewDistance}: {formattedOldDistance: string; formattedNewDistance: string}) =>
`已将固定距离免除调整为每笔报销 ${formattedNewDistance}（之前为 ${formattedOldDistance}）`,
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
40 tasks
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Fixed Issues
$
PROPOSAL:
Tests
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari