-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(shipper): update intelcom, ups and amazon with canadian french strings #954
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
37ac1f8
Extended consts (closes #842)
Bluscream 0208f70
Put intelcom stuff in the correct spot
Bluscream d9bd53c
revert spacing
Bluscream 5cdee81
Update const.py
Bluscream aff93b7
add german amazon email
Bluscream 6bb27a9
Run const.py through pyrfecter.com
Bluscream eda3ca8
Fix one forgotten comma
Bluscream a38d2a5
update tests
firstof9 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,6 +100,7 @@ | |
"Livré", | ||
"Entregado:", | ||
"Bezorgd:", | ||
"Livraison : Votre", | ||
] | ||
AMAZON_SHIPMENT_TRACKING = [ | ||
"shipment-tracking", | ||
|
@@ -110,10 +111,7 @@ | |
"verzending-volgen", | ||
"update-bestelling", | ||
] | ||
AMAZON_EMAIL = [ | ||
"order-update@", | ||
"update-bestelling@", | ||
] | ||
AMAZON_EMAIL = ["order-update@", "update-bestelling@", "versandbestaetigung@"] | ||
AMAZON_PACKAGES = "amazon_packages" | ||
AMAZON_ORDER = "amazon_order" | ||
AMAZON_DELIVERED = "amazon_delivered" | ||
|
@@ -126,6 +124,7 @@ | |
"[email protected]", | ||
"[email protected]", | ||
"[email protected]", | ||
"[email protected]", | ||
] | ||
AMAZON_HUB_SUBJECT = "ready for pickup from Amazon Hub Locker" | ||
AMAZON_HUB_SUBJECT_SEARCH = "(a package to pick up)(.*)(\\d{6})" | ||
|
@@ -143,6 +142,7 @@ | |
"A chegar:", | ||
"Arrivée :", | ||
"Verwachte bezorgdatum:", | ||
"Votre date de livraison prévue est :", | ||
] | ||
AMAZON_TIME_PATTERN_END = [ | ||
"Previously expected:", | ||
|
@@ -177,6 +177,8 @@ | |
"pt_PT.UTF-8", | ||
"pt_BR", | ||
"pt_BR.UTF-8", | ||
"fr_CA", | ||
"fr_CA.UTF-8", | ||
"", | ||
] | ||
|
||
|
@@ -224,6 +226,7 @@ | |
"Your UPS Packages were delivered", | ||
"Your UPS Parcel was delivered", | ||
"Your UPS Parcels were delivered", | ||
"Votre colis UPS a été livré", | ||
], | ||
}, | ||
"ups_delivering": { | ||
|
@@ -233,6 +236,8 @@ | |
"UPS Update: Follow Your Delivery on a Live Map", | ||
"UPS Pre-Arrival: Your Driver is Arriving Soon! Follow on a Live Map", | ||
"UPS Update: Parcel Scheduled for Delivery Today", | ||
"Mise à jour UPS : Livraison du colis prévue demain", | ||
"Mise à jour UPS : Livraison du colis prévue aujourd'hui", | ||
], | ||
}, | ||
"ups_exception": { | ||
|
@@ -563,11 +568,17 @@ | |
# Intelcom | ||
"intelcom_delivered": { | ||
"email": ["[email protected]"], | ||
"subject": ["Your order has been delivered!"], | ||
"subject": [ | ||
"Your order has been delivered!" "Votre commande a été livrée!", | ||
"Votre colis a été livré!", | ||
], | ||
}, | ||
"intelcom_delivering": { | ||
"email": ["[email protected]"], | ||
"subject": ["Your package is on the way!"], | ||
"subject": [ | ||
"Your package is on the way!", | ||
"Votre colis est en chemin!", | ||
], | ||
}, | ||
"intelcom_packages": { | ||
"email": ["[email protected]"], | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what a dumb change, but apparently the linter is happy now, so be it ig