Skip to content
This repository has been archived by the owner on Jul 17, 2020. It is now read-only.

Commit

Permalink
Clarify weekly summaries in en, fr #158
Browse files Browse the repository at this point in the history
  • Loading branch information
J. T. L committed Jan 12, 2018
1 parent 39bc4c6 commit cbeed0a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions lib/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ module.exports = {
"during": "$1 $2",
"for-week": "$1 throughout the week",
"over-weekend": "$1 over the weekend",
"temperatures-peaking": "temperatures peaking at $1 $2",
"temperatures-rising": "temperatures rising to $1 $2",
"temperatures-valleying": "temperatures bottoming out at $1 $2",
"temperatures-falling": "temperatures falling to $1 $2",
"temperatures-peaking": "high temperatures peaking at $1 $2",
"temperatures-rising": "high temperatures rising to $1 $2",
"temperatures-valleying": "high temperatures bottoming out at $1 $2",
"temperatures-falling": "high temperatures falling to $1 $2",
/* Capitalize the first letter of every word, except if that word is
* "and". (This is a very crude bastardization of proper English titling
* rules, but it is adequate for the purposes of this module.) */
Expand Down
8 changes: 4 additions & 4 deletions lib/lang/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ module.exports = {
"during": "$1 $2",
"for-week": "$1 pendant toute la semaine",
"over-weekend": "$1 pendant tout le week-end",
"temperatures-peaking": "des températures atteignant $1 $2",
"temperatures-rising": "des températures montant jusqu’à $1 $2",
"temperatures-valleying": "des températures atteignant $1 $2",
"temperatures-falling": "des températures descendant jusqu’à $1 $2",
"temperatures-peaking": "des températures maximales atteignant $1 $2",
"temperatures-rising": "des températures maximales montant jusqu’à $1 $2",
"temperatures-valleying": "des températures maximales atteignant $1 $2",
"temperatures-falling": "des températures maximales descendant jusqu’à $1 $2",
/* Capitalize the first letter of every word, except if that word is "et".
*
* Fun fact: JavaScript regex's "\w" and "\b" don't recognize accented
Expand Down
10 changes: 5 additions & 5 deletions test_cases/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,35 +201,35 @@
"afternoon"]],


"No precipitation throughout the week, with temperatures peaking at 85\u00B0F tomorrow.":
"No precipitation throughout the week, with high temperatures peaking at 85\u00B0F tomorrow.":
["sentence", ["with",
["for-week", "no-precipitation"],
["temperatures-peaking",
["fahrenheit", 85],
"tomorrow"]]],

"Mixed precipitation over the weekend, with temperatures rising to 32\u00B0C on Thursday.":
"Mixed precipitation over the weekend, with high temperatures rising to 32\u00B0C on Thursday.":
["sentence", ["with",
["over-weekend", "mixed-precipitation"],
["temperatures-rising",
["celsius", 32],
"thursday"]]],

"Drizzle on Monday, with temperatures bottoming out at 15\u00B0F on Friday.":
"Drizzle on Monday, with high temperatures bottoming out at 15\u00B0F on Friday.":
["sentence", ["with",
["during", "very-light-rain", "monday"],
["temperatures-valleying",
["fahrenheit", 15],
"friday"]]],

"Light snow on Tuesday and next Wednesday, with temperatures falling to 0\u00B0C on Sunday.":
"Light snow on Tuesday and next Wednesday, with high temperatures falling to 0\u00B0C on Sunday.":
["sentence", ["with",
["during", "light-snow", ["and", "tuesday", "next-wednesday"]],
["temperatures-falling",
["celsius", 0],
"sunday"]]],

"Precipitation today through Saturday, with temperatures peaking at 100\u00B0F on Monday.":
"Precipitation today through Saturday, with high temperatures peaking at 100\u00B0F on Monday.":
["sentence", ["with",
["during",
"medium-precipitation",
Expand Down
10 changes: 5 additions & 5 deletions test_cases/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,35 +201,35 @@
"afternoon"]],


"Pas de précipitations pendant toute la semaine, avec des températures atteignant 85\u00B0F demain.":
"Pas de précipitations pendant toute la semaine, avec des températures maximales atteignant 85\u00B0F demain.":
["sentence", ["with",
["for-week", "no-precipitation"],
["temperatures-peaking",
["fahrenheit", 85],
"tomorrow"]]],

"Précipitations mêlées pendant tout le week-end, avec des températures montant jusqu’à 32\u00B0C jeudi.":
"Précipitations mêlées pendant tout le week-end, avec des températures maximales montant jusqu’à 32\u00B0C jeudi.":
["sentence", ["with",
["over-weekend", "mixed-precipitation"],
["temperatures-rising",
["celsius", 32],
"thursday"]]],

"Bruine aujourd’hui, avec des températures atteignant 15\u00B0F vendredi.":
"Bruine aujourd’hui, avec des températures maximales atteignant 15\u00B0F vendredi.":
["sentence", ["with",
["during", "very-light-rain", "today"],
["temperatures-valleying",
["fahrenheit", 15],
"friday"]]],

"Neige faible lundi et mardi, avec des températures descendant jusqu’à 0\u00B0C dimanche.":
"Neige faible lundi et mardi, avec des températures maximales descendant jusqu’à 0\u00B0C dimanche.":
["sentence", ["with",
["during", "light-snow", ["and", "monday", "tuesday"]],
["temperatures-falling",
["celsius", 0],
"sunday"]]],

"Précipitations mercredi jusqu’à samedi, avec des températures atteignant 100\u00B0F lundi.":
"Précipitations mercredi jusqu’à samedi, avec des températures maximales atteignant 100\u00B0F lundi.":
["sentence", ["with",
["during",
"medium-precipitation",
Expand Down

0 comments on commit cbeed0a

Please sign in to comment.