diff options
61 files changed, 287 insertions, 264 deletions
diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml index 3ab9959cd..dedbf60ed 100644 --- a/InCallUI/res/values-af/strings.xml +++ b/InCallUI/res/values-af/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> myl ver"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km ver"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Nou oop"</string> <string name="closed_now" msgid="9175774453982778909">"Nou gesluit"</string> </resources> diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml index 2cb3ec124..148027076 100644 --- a/InCallUI/res/values-bg/strings.xml +++ b/InCallUI/res/values-bg/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"На <xliff:g id="DISTANCE">%.1f</xliff:g> мили"</string> <string name="distance_metric_away" msgid="166931929505893599">"На <xliff:g id="DISTANCE">%.1f</xliff:g> км"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>; <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"В момента работи"</string> <string name="closed_now" msgid="9175774453982778909">"В момента не работи"</string> </resources> diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml index 87c0570ff..575ab2c17 100644 --- a/InCallUI/res/values-bn-rBD/strings.xml +++ b/InCallUI/res/values-bn-rBD/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> মাইল দূরে"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> কিলোমিটার দূরে"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"এখন খোলা রয়েছে"</string> <string name="closed_now" msgid="9175774453982778909">"এখন বন্ধ রয়েছে"</string> </resources> diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml index 757a3ca71..1c4f67522 100644 --- a/InCallUI/res/values-da/strings.xml +++ b/InCallUI/res/values-da/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil væk"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km væk"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>-<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Åbent nu"</string> <string name="closed_now" msgid="9175774453982778909">"Lukket for i dag"</string> </resources> diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml index 501625380..58d457766 100644 --- a/InCallUI/res/values-de/strings.xml +++ b/InCallUI/res/values-de/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> Meilen entfernt"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> Kilometer entfernt"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> bis <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Jetzt geöffnet"</string> <string name="closed_now" msgid="9175774453982778909">"Jetzt geschlossen"</string> </resources> diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml index 1c52a6f63..3417ce62b 100644 --- a/InCallUI/res/values-es-rUS/strings.xml +++ b/InCallUI/res/values-es-rUS/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"A <xliff:g id="DISTANCE">%.1f</xliff:g> millas"</string> <string name="distance_metric_away" msgid="166931929505893599">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g> y <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Abierto ahora"</string> <string name="closed_now" msgid="9175774453982778909">"Cerrado ahora"</string> </resources> diff --git a/InCallUI/res/values-et-rEE/strings.xml b/InCallUI/res/values-et-rEE/strings.xml index 79d17aeb9..80f301eec 100644 --- a/InCallUI/res/values-et-rEE/strings.xml +++ b/InCallUI/res/values-et-rEE/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> miili kaugusel"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km kaugusel"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Praegu avatud"</string> <string name="closed_now" msgid="9175774453982778909">"Praegu suletud"</string> </resources> diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml index db96292b3..4b9000545 100644 --- a/InCallUI/res/values-fa/strings.xml +++ b/InCallUI/res/values-fa/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> مایل دورتر"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> کیلومتر دورتر"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>، <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> تا <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>، <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"اکنون باز است"</string> <string name="closed_now" msgid="9175774453982778909">"اکنون بسته است"</string> </resources> diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml index fc1858cd2..f635384d0 100644 --- a/InCallUI/res/values-fi/strings.xml +++ b/InCallUI/res/values-fi/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"Etäisyys: <xliff:g id="DISTANCE">%.1f</xliff:g> mailia"</string> <string name="distance_metric_away" msgid="166931929505893599">"Etäisyys: <xliff:g id="DISTANCE">%.1f</xliff:g> kilometriä"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Auki nyt"</string> <string name="closed_now" msgid="9175774453982778909">"Suljettu nyt"</string> </resources> diff --git a/InCallUI/res/values-fr-rCA/strings.xml b/InCallUI/res/values-fr-rCA/strings.xml index 6f4066cc7..8a3463c4b 100644 --- a/InCallUI/res/values-fr-rCA/strings.xml +++ b/InCallUI/res/values-fr-rCA/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"À <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string> <string name="distance_metric_away" msgid="166931929505893599">"À <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> à <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Ouvert"</string> <string name="closed_now" msgid="9175774453982778909">"Fermé"</string> </resources> diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml index 386cb4dfb..2fd4ccf5e 100644 --- a/InCallUI/res/values-fr/strings.xml +++ b/InCallUI/res/values-fr/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"À <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string> <string name="distance_metric_away" msgid="166931929505893599">"À <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Ouvert"</string> <string name="closed_now" msgid="9175774453982778909">"Fermé"</string> </resources> diff --git a/InCallUI/res/values-gu-rIN/strings.xml b/InCallUI/res/values-gu-rIN/strings.xml index d087292be..82e5550e6 100644 --- a/InCallUI/res/values-gu-rIN/strings.xml +++ b/InCallUI/res/values-gu-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> માઇલ દૂર"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> કિમી દૂર"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"હમણાં ખોલો"</string> <string name="closed_now" msgid="9175774453982778909">"અત્યારે બંધ કર્યું"</string> </resources> diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml index 4de715ffb..bb15aeb7e 100644 --- a/InCallUI/res/values-hi/strings.xml +++ b/InCallUI/res/values-hi/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> मील दूर"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> किमी दूर"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"अभी खुला है"</string> <string name="closed_now" msgid="9175774453982778909">"अभी बंद है"</string> </resources> diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml index c1581a6f1..75914325a 100644 --- a/InCallUI/res/values-hr/strings.xml +++ b/InCallUI/res/values-hr/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi udaljenosti"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km udaljenosti"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Trenutačno otvoreno"</string> <string name="closed_now" msgid="9175774453982778909">"Trenutačno zatvoreno"</string> </resources> diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml index 1ede2b954..1cbd39f28 100644 --- a/InCallUI/res/values-hy-rAM/strings.xml +++ b/InCallUI/res/values-hy-rAM/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> մղոն հեռու"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> կմ հեռու"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Հիմա բաց է"</string> <string name="closed_now" msgid="9175774453982778909">"Հիմա փակ է"</string> </resources> diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml index 1bf41ea4f..30f6c6dac 100644 --- a/InCallUI/res/values-in/strings.xml +++ b/InCallUI/res/values-in/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Buka sekarang"</string> <string name="closed_now" msgid="9175774453982778909">"Sekarang tutup"</string> </resources> diff --git a/InCallUI/res/values-is-rIS/strings.xml b/InCallUI/res/values-is-rIS/strings.xml index 856760615..adf755c84 100644 --- a/InCallUI/res/values-is-rIS/strings.xml +++ b/InCallUI/res/values-is-rIS/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"í <xliff:g id="DISTANCE">%.1f</xliff:g> míl. fjarlægð"</string> <string name="distance_metric_away" msgid="166931929505893599">"í <xliff:g id="DISTANCE">%.1f</xliff:g> km fjarlægð"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Opið núna"</string> <string name="closed_now" msgid="9175774453982778909">"Lokað núna"</string> </resources> diff --git a/InCallUI/res/values-it/strings.xml b/InCallUI/res/values-it/strings.xml index 7a65aca4b..4e624316c 100644 --- a/InCallUI/res/values-it/strings.xml +++ b/InCallUI/res/values-it/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"Distante <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string> <string name="distance_metric_away" msgid="166931929505893599">"Distante <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Aperto ora"</string> <string name="closed_now" msgid="9175774453982778909">"Ora chiuso"</string> </resources> diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml index a7308b9b8..71a42c3dd 100644 --- a/InCallUI/res/values-ja/strings.xml +++ b/InCallUI/res/values-ja/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g>マイル圏内"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g>km圏内"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>、<xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>～<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>、<xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"現在営業中"</string> <string name="closed_now" msgid="9175774453982778909">"営業終了"</string> </resources> diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml index 0cbc5a548..bcdb3e0ae 100644 --- a/InCallUI/res/values-ka-rGE/strings.xml +++ b/InCallUI/res/values-ka-rGE/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> მილში"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> კმ-ში"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ახლა ღიაა"</string> <string name="closed_now" msgid="9175774453982778909">"ახლა დაკეტილია"</string> </resources> diff --git a/InCallUI/res/values-kk-rKZ/strings.xml b/InCallUI/res/values-kk-rKZ/strings.xml index 090d16cb7..fd02d2421 100644 --- a/InCallUI/res/values-kk-rKZ/strings.xml +++ b/InCallUI/res/values-kk-rKZ/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> миля қашықтықта"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> км қашықтықта"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Қазір ашық"</string> <string name="closed_now" msgid="9175774453982778909">"Қазір жабық"</string> </resources> diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml index fb8c1d7dd..1d90cbaa3 100644 --- a/InCallUI/res/values-km-rKH/strings.xml +++ b/InCallUI/res/values-km-rKH/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"ចម្ងាយ <xliff:g id="DISTANCE">%.1f</xliff:g> ម៉ាយល៍"</string> <string name="distance_metric_away" msgid="166931929505893599">"ចម្ងាយ <xliff:g id="DISTANCE">%.1f</xliff:g> គម"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"បើកឥឡូវនេះ"</string> <string name="closed_now" msgid="9175774453982778909">"បិទឥឡូវនេះ"</string> </resources> diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml index 8a080a236..f2a5eb2de 100644 --- a/InCallUI/res/values-kn-rIN/strings.xml +++ b/InCallUI/res/values-kn-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> ಮೈಲು ದೂರ"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> ಕಿಮೀ ದೂರ"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ಇದೀಗ ತೆರೆಯಲಾಗಿದೆ"</string> <string name="closed_now" msgid="9175774453982778909">"ಇದೀಗ ಮುಚ್ಚಲಾಗಿದೆ"</string> </resources> diff --git a/InCallUI/res/values-ky-rKG/strings.xml b/InCallUI/res/values-ky-rKG/strings.xml index 31a91ef42..54d5223a1 100644 --- a/InCallUI/res/values-ky-rKG/strings.xml +++ b/InCallUI/res/values-ky-rKG/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> миля алыста"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> км алыста"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Эми ачылды"</string> <string name="closed_now" msgid="9175774453982778909">"Эми жабылды"</string> </resources> diff --git a/InCallUI/res/values-lo-rLA/strings.xml b/InCallUI/res/values-lo-rLA/strings.xml index 888f3bdac..61d592584 100644 --- a/InCallUI/res/values-lo-rLA/strings.xml +++ b/InCallUI/res/values-lo-rLA/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> ໄມລ໌ ຫ່າງອອກໄປ"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> ກມ ຫ່າງອອກໄປ"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ດຽວນີ້ເປີດ"</string> <string name="closed_now" msgid="9175774453982778909">"ດຽວນີ້ປິດແລ້ວ"</string> </resources> diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml index d1741063e..c431c52d5 100644 --- a/InCallUI/res/values-lt/strings.xml +++ b/InCallUI/res/values-lt/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"Už <xliff:g id="DISTANCE">%.1f</xliff:g> myl."</string> <string name="distance_metric_away" msgid="166931929505893599">"Už <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Dabar atidaryta"</string> <string name="closed_now" msgid="9175774453982778909">"Dabar uždaryta"</string> </resources> diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml index 31f9e2443..27ea123ae 100644 --- a/InCallUI/res/values-lv/strings.xml +++ b/InCallUI/res/values-lv/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> jūdzes(-džu) attālumā"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km attālumā"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Atvērts"</string> <string name="closed_now" msgid="9175774453982778909">"Slēgts"</string> </resources> diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml index 6dd34ee70..a27fb1207 100644 --- a/InCallUI/res/values-ml-rIN/strings.xml +++ b/InCallUI/res/values-ml-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> മൈൽ അകലെ"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> കിലോമീറ്റർ അകലെ"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ഇപ്പോൾ തുറന്നിരിക്കുന്നു"</string> <string name="closed_now" msgid="9175774453982778909">"ഇപ്പോൾ അടച്ചിരിക്കുന്നു"</string> </resources> diff --git a/InCallUI/res/values-mn-rMN/strings.xml b/InCallUI/res/values-mn-rMN/strings.xml index 94c7bfcf6..3306095ee 100644 --- a/InCallUI/res/values-mn-rMN/strings.xml +++ b/InCallUI/res/values-mn-rMN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> милийн зайтай"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> км-н зайтай"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Одоо нээлттэй"</string> <string name="closed_now" msgid="9175774453982778909">"Одоо хаалттай"</string> </resources> diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml index c251dbb17..d7d25a893 100644 --- a/InCallUI/res/values-mr-rIN/strings.xml +++ b/InCallUI/res/values-mr-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> मैल दूर"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> किमी दूर"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"आता उघडा"</string> <string name="closed_now" msgid="9175774453982778909">"आता बंद केले आहे"</string> </resources> diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml index baf661fc4..303a3f72a 100644 --- a/InCallUI/res/values-ms-rMY/strings.xml +++ b/InCallUI/res/values-ms-rMY/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> batu dari sini"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km dari sini"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Dibuka sekarang"</string> <string name="closed_now" msgid="9175774453982778909">"Ditutup sekarang"</string> </resources> diff --git a/InCallUI/res/values-my-rMM/strings.xml b/InCallUI/res/values-my-rMM/strings.xml index cb5103cb8..813bc92eb 100644 --- a/InCallUI/res/values-my-rMM/strings.xml +++ b/InCallUI/res/values-my-rMM/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi အကွာ"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km အကွာ"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>၊ <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>၊ <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ယခုဖွင့်ရန်"</string> <string name="closed_now" msgid="9175774453982778909">"ယခုပိတ်ရန်"</string> </resources> diff --git a/InCallUI/res/values-ne-rNP/strings.xml b/InCallUI/res/values-ne-rNP/strings.xml index cb86c9f41..be65bc426 100644 --- a/InCallUI/res/values-ne-rNP/strings.xml +++ b/InCallUI/res/values-ne-rNP/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> माइल टाढा"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> किलोमिटर टाढा"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"अहिले खुला छ"</string> <string name="closed_now" msgid="9175774453982778909">"अब बन्द भयो"</string> </resources> diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml index 08e215478..02b6dd1d3 100644 --- a/InCallUI/res/values-nl/strings.xml +++ b/InCallUI/res/values-nl/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mijl hiervandaan"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km hiervandaan"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Nu geopend"</string> <string name="closed_now" msgid="9175774453982778909">"Nu gesloten"</string> </resources> diff --git a/InCallUI/res/values-pa-rIN/strings.xml b/InCallUI/res/values-pa-rIN/strings.xml index 91af3b450..7430f9b9d 100644 --- a/InCallUI/res/values-pa-rIN/strings.xml +++ b/InCallUI/res/values-pa-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> ਮੀਲ ਦੂਰ"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> ਕਿ.ਮੀ. ਦੂਰ"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ਹੁਣ ਖੁੱਲ੍ਹਾ ਹੈ"</string> <string name="closed_now" msgid="9175774453982778909">"ਹੁਣ ਬੰਦ ਹੈ"</string> </resources> diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml index 1af64726a..e2afa1b85 100644 --- a/InCallUI/res/values-pl/strings.xml +++ b/InCallUI/res/values-pl/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil(e) stąd"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km stąd"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Teraz otwarte"</string> <string name="closed_now" msgid="9175774453982778909">"Teraz zamknięte"</string> </resources> diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml index 38ef316fa..5290f02c4 100644 --- a/InCallUI/res/values-pt-rPT/strings.xml +++ b/InCallUI/res/values-pt-rPT/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"A <xliff:g id="DISTANCE">%.1f</xliff:g> milhas de distância"</string> <string name="distance_metric_away" msgid="166931929505893599">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km de distância"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Aberto agora"</string> <string name="closed_now" msgid="9175774453982778909">"Fechado agora"</string> </resources> diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml index 6325946e6..61c6265b9 100644 --- a/InCallUI/res/values-pt/strings.xml +++ b/InCallUI/res/values-pt/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> milhas de distância"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km de distância"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Aberto agora"</string> <string name="closed_now" msgid="9175774453982778909">"Fechado agora"</string> </resources> diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml index e9934d0e8..e4b11c85d 100644 --- a/InCallUI/res/values-ro/strings.xml +++ b/InCallUI/res/values-ro/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi distanță"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km distanță"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Acum este deschis"</string> <string name="closed_now" msgid="9175774453982778909">"Acum este închis"</string> </resources> diff --git a/InCallUI/res/values-si-rLK/strings.xml b/InCallUI/res/values-si-rLK/strings.xml index 9fe3510de..dca985bae 100644 --- a/InCallUI/res/values-si-rLK/strings.xml +++ b/InCallUI/res/values-si-rLK/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"සැතපුම් <xliff:g id="DISTANCE">%.1f</xliff:g>ක් ඈතින්"</string> <string name="distance_metric_away" msgid="166931929505893599">"කි.මි. <xliff:g id="DISTANCE">%.1f</xliff:g>ක් ඈතින්"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"දැන් විවෘතයි"</string> <string name="closed_now" msgid="9175774453982778909">"දැන් වසා ඇත"</string> </resources> diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml index ddd9df65e..fd382e3c5 100644 --- a/InCallUI/res/values-sk/strings.xml +++ b/InCallUI/res/values-sk/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"Vzdialené <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string> <string name="distance_metric_away" msgid="166931929505893599">"Vzdialené <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Otvorené"</string> <string name="closed_now" msgid="9175774453982778909">"Zatvorené"</string> </resources> diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml index 6e93f4913..6f25f3ff5 100644 --- a/InCallUI/res/values-sl/strings.xml +++ b/InCallUI/res/values-sl/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi stran"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km stran"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Trenutno odprto"</string> <string name="closed_now" msgid="9175774453982778909">"Trenutno zaprto"</string> </resources> diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml index 708f9034a..3bb4737fb 100644 --- a/InCallUI/res/values-sr/strings.xml +++ b/InCallUI/res/values-sr/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"Удаљеност је <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string> <string name="distance_metric_away" msgid="166931929505893599">"Удаљеност је <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Тренутно отворено"</string> <string name="closed_now" msgid="9175774453982778909">"Тренутно затворено"</string> </resources> diff --git a/InCallUI/res/values-sv/strings.xml b/InCallUI/res/values-sv/strings.xml index 94e8c62a1..f78a3312d 100644 --- a/InCallUI/res/values-sv/strings.xml +++ b/InCallUI/res/values-sv/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> miles bort"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km bort"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Öppet"</string> <string name="closed_now" msgid="9175774453982778909">"Stängt"</string> </resources> diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml index d44e5fe33..a2efe9e0e 100644 --- a/InCallUI/res/values-ta-rIN/strings.xml +++ b/InCallUI/res/values-ta-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> மைல் தொலைவில்"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> கிமீ தொலைவில்"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"இப்போது திறக்கப்பட்டுள்ளது"</string> <string name="closed_now" msgid="9175774453982778909">"இப்போது மூடப்பட்டுள்ளது"</string> </resources> diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml index a86ae8ec4..a839320bd 100644 --- a/InCallUI/res/values-te-rIN/strings.xml +++ b/InCallUI/res/values-te-rIN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> మై. దూరంలో ఉంది"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> కి.మీ దూరంలో ఉంది"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ఇప్పుడు తెరిచి ఉంది"</string> <string name="closed_now" msgid="9175774453982778909">"ఇప్పుడు మూసివేయబడింది"</string> </resources> diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml index 7e401b323..747d15f0d 100644 --- a/InCallUI/res/values-th/strings.xml +++ b/InCallUI/res/values-th/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"อยู่ห่างออกไป <xliff:g id="DISTANCE">%.1f</xliff:g> ไมล์"</string> <string name="distance_metric_away" msgid="166931929505893599">"อยู่ห่างออกไป <xliff:g id="DISTANCE">%.1f</xliff:g> กม."</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ขณะนี้เปิดทำการ"</string> <string name="closed_now" msgid="9175774453982778909">"ขณะนี้ปิดทำการ"</string> </resources> diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml index c1e57c815..2c25adf43 100644 --- a/InCallUI/res/values-tl/strings.xml +++ b/InCallUI/res/values-tl/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> (na) milya ang layo"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> (na) kilometro ang layo"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Bukas ngayon"</string> <string name="closed_now" msgid="9175774453982778909">"Sarado ngayon"</string> </resources> diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml index 44613e77c..9ea589b5d 100644 --- a/InCallUI/res/values-tr/strings.xml +++ b/InCallUI/res/values-tr/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil uzakta"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km uzakta"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Şu an açık"</string> <string name="closed_now" msgid="9175774453982778909">"Şu an kapalı"</string> </resources> diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml index 25db82efe..c6ae25209 100644 --- a/InCallUI/res/values-uk/strings.xml +++ b/InCallUI/res/values-uk/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"За <xliff:g id="DISTANCE">%.1f</xliff:g> мил."</string> <string name="distance_metric_away" msgid="166931929505893599">"За <xliff:g id="DISTANCE">%.1f</xliff:g> км"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Відчинено"</string> <string name="closed_now" msgid="9175774453982778909">"Зачинено"</string> </resources> diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml index 6016213bb..e4bb2ad71 100644 --- a/InCallUI/res/values-ur-rPK/strings.xml +++ b/InCallUI/res/values-ur-rPK/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> میل دور"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> کلومیٹر دور"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>، <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>، <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"ابھی کھلا ہے"</string> <string name="closed_now" msgid="9175774453982778909">"اب بند ہے"</string> </resources> diff --git a/InCallUI/res/values-uz-rUZ/strings.xml b/InCallUI/res/values-uz-rUZ/strings.xml index 375905051..22b234dac 100644 --- a/InCallUI/res/values-uz-rUZ/strings.xml +++ b/InCallUI/res/values-uz-rUZ/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil uzoqda"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km uzoqda"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Ochiq"</string> <string name="closed_now" msgid="9175774453982778909">"Yopiq"</string> </resources> diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml index 9878be64a..1f78ac790 100644 --- a/InCallUI/res/values-vi/strings.xml +++ b/InCallUI/res/values-vi/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"Cách <xliff:g id="DISTANCE">%.1f</xliff:g> dặm"</string> <string name="distance_metric_away" msgid="166931929505893599">"Cách <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Mở ngay bây giờ"</string> <string name="closed_now" msgid="9175774453982778909">"Hiện đã đóng cửa"</string> </resources> diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml index 8e7dddba2..8ad97fb0f 100644 --- a/InCallUI/res/values-zh-rCN/strings.xml +++ b/InCallUI/res/values-zh-rCN/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里远"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里远"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="LOCALITY">%2$s</xliff:g><xliff:g id="STREET_ADDRESS">%1$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>，<xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"营业中"</string> <string name="closed_now" msgid="9175774453982778909">"现已打烊"</string> </resources> diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml index cacc011ce..4cc1a7893 100644 --- a/InCallUI/res/values-zh-rHK/strings.xml +++ b/InCallUI/res/values-zh-rHK/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里外"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里外"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g> (<xliff:g id="LATER_TIME">%2$s</xliff:g>)"</string> <string name="open_now" msgid="6439301193613349163">"營業中"</string> <string name="closed_now" msgid="9175774453982778909">"休息"</string> </resources> diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml index d48f281fe..55f64adce 100644 --- a/InCallUI/res/values-zh-rTW/strings.xml +++ b/InCallUI/res/values-zh-rTW/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里遠"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里遠"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>，<xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>，<xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"營業中"</string> <string name="closed_now" msgid="9175774453982778909">"今日已結束營業"</string> </resources> diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml index 1eb70f292..0b0886c58 100644 --- a/InCallUI/res/values-zu/strings.xml +++ b/InCallUI/res/values-zu/strings.xml @@ -170,10 +170,8 @@ <string name="distance_imperial_away" msgid="437508440176409037">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi kude"</string> <string name="distance_metric_away" msgid="166931929505893599">"<xliff:g id="DISTANCE">%.1f</xliff:g> km kude"</string> <string name="display_address" msgid="7307400970699471708">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string> - <!-- no translation found for open_time_span (6709726401179550381) --> - <skip /> - <!-- no translation found for opening_hours (8524931350345922176) --> - <skip /> + <string name="open_time_span" msgid="6709726401179550381">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string> + <string name="opening_hours" msgid="8524931350345922176">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string> <string name="open_now" msgid="6439301193613349163">"Kuvuliwe manje"</string> <string name="closed_now" msgid="9175774453982778909">"Kuvaliwe manje"</string> </resources> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 54d68c9d2..b30ca6596 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -487,6 +487,14 @@ The string is used to build a list of opening hours. [CHAR LIMIT=NONE] --> <string name="opening_hours"><xliff:g id="earlier_times">%1$s</xliff:g>, <xliff:g id="later_time">%2$s</xliff:g></string> + <!-- Used to express when a location will open the next day. [CHAR LIMIT=NONE] --> + <string name="opens_tomorrow_at">Opens tomorrow at <xliff:g id="open_time">%s</xliff:g></string> + <!-- Used to express the next time at which a location will be open today. [CHAR LIMIT=NONE] --> + <string name="opens_today_at">Opens today at <xliff:g id="open_time">%s</xliff:g></string> + <!-- Used to express the next time at which a location will close today. [CHAR LIMIT=NONE] --> + <string name="closes_today_at">Closes at <xliff:g id="close_time">%s</xliff:g></string> + <!-- Used to express the next time at which a location closed today if it is already closed. [CHAR LIMIT=NONE] --> + <string name="closed_today_at">Closed today at <xliff:g id="close_time">%s</xliff:g></string> <!-- Displayed when a place is open. --> <string name="open_now">Open now</string> <!-- Displayed when a place is closed. --> diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java index c5176b1a1..6bbe52f46 100644 --- a/InCallUI/src/com/android/incallui/ContactInfoCache.java +++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java @@ -241,6 +241,7 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete Log.d(TAG, "Contact lookup. Local contact found, starting image load"); // Load the image with a callback to update the image state. // When the load is finished, onImageLoadComplete() will be called. + cacheEntry.isLoadingPhoto = true; ContactsAsyncHelper.startObtainPhotoAsync(TOKEN_UPDATE_PHOTO_FOR_CALL_STATE, mContext, cacheEntry.displayPhotoUri, ContactInfoCache.this, callId); } else { @@ -302,19 +303,21 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete entry.photo = mContext.getResources().getDrawable(R.drawable.img_business); } - boolean hasContactInteractions = false; + mInfoMap.put(mCallId, entry); + sendInfoNotifications(mCallId, entry); + if (mContactUtils != null) { // This method will callback "onContactInteractionsFound". - hasContactInteractions = mContactUtils.retrieveContactInteractionsFromLookupKey( - info.getLookupKey(), this); + entry.isLoadingContactInteractions = + mContactUtils.retrieveContactInteractionsFromLookupKey( + info.getLookupKey(), this); } - // Add the contact info to the cache. - mInfoMap.put(mCallId, entry); - sendInfoNotifications(mCallId, entry); + entry.isLoadingPhoto = info.getImageUrl() != null; - // If there is no image then we should not expect another callback. - if (info.getImageUrl() == null && !hasContactInteractions) { + // If there is no image or contact interactions then we should not expect another + // callback. + if (!entry.isLoadingPhoto && !entry.isLoadingContactInteractions) { // We're done, so clear callbacks clearCallbacks(mCallId); } @@ -329,10 +332,23 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete public void onContactInteractionsFound(Address address, List<Pair<Calendar, Calendar>> openingHours) { final ContactCacheEntry entry = mInfoMap.get(mCallId); + if (entry == null) { + Log.e(this, "Contact context received for empty search entry."); + clearCallbacks(mCallId); + return; + } + + entry.isLoadingContactInteractions = false; + + Log.v(ContactInfoCache.this, "Setting contact interactions for entry: ", entry); + entry.locationAddress = address; entry.openingHours = openingHours; sendContactInteractionsNotifications(mCallId, entry); - clearCallbacks(mCallId); + + if (!entry.isLoadingPhoto) { + clearCallbacks(mCallId); + } } } @@ -354,6 +370,9 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete clearCallbacks(callId); return; } + + entry.isLoadingPhoto = false; + Log.d(this, "setting photo for entry: ", entry); // Conference call icons are being handled in CallCardPresenter. @@ -369,7 +388,10 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete } sendImageNotifications(callId, entry); - clearCallbacks(callId); + + if (!entry.isLoadingContactInteractions) { + clearCallbacks(callId); + } } /** @@ -617,6 +639,10 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete public String label; public Drawable photo; public boolean isSipCall; + // Note in cache entry whether this is a pending async loading action to know whether to + // wait for its callback or not. + public boolean isLoadingPhoto; + public boolean isLoadingContactInteractions; /** This will be used for the "view" notification. */ public Uri contactUri; /** Either a display photo or a thumbnail URI. */ diff --git a/InCallUI/src/com/android/incallui/InCallContactInteractions.java b/InCallUI/src/com/android/incallui/InCallContactInteractions.java index 275243e4d..6fade9bdf 100644 --- a/InCallUI/src/com/android/incallui/InCallContactInteractions.java +++ b/InCallUI/src/com/android/incallui/InCallContactInteractions.java @@ -142,33 +142,82 @@ public class InCallContactInteractions { BusinessContextInfo hoursInfo = new BusinessContextInfo(); hoursInfo.iconId = R.drawable.ic_schedule_white_24dp; - boolean isOpen = false; + boolean isOpenNow = false; + // This variable records which interval the current time is after. 0 denotes none of the + // intervals, 1 after the first interval, etc. + int afterInterval = 0; + // This variable records counts the number of time intervals in today's opening hours. + int todaysIntervalCount = 0; for (Pair<Calendar, Calendar> hours : openingHours) { if (hours.first.compareTo(currentTime) <= 0 && currentTime.compareTo(hours.second) < 0) { // If the current time is on or after the opening time and strictly before the // closing time, then this business is open. - isOpen = true; + isOpenNow = true; } - String openTimeSpan = mContext.getString(R.string.open_time_span, - DateFormat.getTimeFormat(mContext).format(hours.first.getTime()), - DateFormat.getTimeFormat(mContext).format(hours.second.getTime())); + if (currentTime.get(Calendar.DAY_OF_YEAR) == hours.first.get(Calendar.DAY_OF_YEAR)) { + todaysIntervalCount += 1; + } - if (TextUtils.isEmpty(hoursInfo.detail)) { - hoursInfo.detail = openTimeSpan; - } else { - hoursInfo.detail = mContext.getString(R.string.opening_hours, hoursInfo.detail, - openTimeSpan); + if (currentTime.compareTo(hours.second) > 0) { + // This assumes that the list of intervals is sorted by time. + afterInterval += 1; } } - hoursInfo.heading = isOpen ? mContext.getString(R.string.open_now) + hoursInfo.heading = isOpenNow ? mContext.getString(R.string.open_now) : mContext.getString(R.string.closed_now); + /* + * The following logic determines what to display in various cases for hours of operation. + * + * - Display all intervals if open now and number of intervals is <=2. + * - Display next closing time if open now and number of intervals is >2. + * - Display next opening time if currently closed but opens later today. + * - Display last time it closed today if closed now and tomorrow's hours are unknown. + * - Display tomorrow's first open time if closed today and tomorrow's hours are known. + */ + if (isOpenNow) { + if (todaysIntervalCount == 1) { + hoursInfo.detail = getTimeSpanStringForHours(openingHours.get(0)); + } else if (todaysIntervalCount == 2) { + hoursInfo.detail = mContext.getString(R.string.opening_hours, + getTimeSpanStringForHours(openingHours.get(0)), + getTimeSpanStringForHours(openingHours.get(1))); + } else { + hoursInfo.detail = mContext.getString(R.string.closes_today_at, + getFormattedTimeForCalendar(openingHours.get(afterInterval).second)); + } + } else { + // Currently closed + final int lastIntervalToday = todaysIntervalCount - 1; + if (currentTime.before(openingHours.get(lastIntervalToday).first)) { + hoursInfo.detail = mContext.getString(R.string.opens_today_at, + getFormattedTimeForCalendar(openingHours.get(afterInterval).first)); + } else if (todaysIntervalCount < openingHours.size()){ + // Assuming all intervals after today's intervals are exhausted are tomorrow's. + hoursInfo.detail = mContext.getString(R.string.opens_tomorrow_at, + getFormattedTimeForCalendar(openingHours.get(todaysIntervalCount).first)); + } else { + hoursInfo.detail = mContext.getString(R.string.closed_today_at, + getFormattedTimeForCalendar(openingHours.get(lastIntervalToday).second)); + } + } + return hoursInfo; } + String getFormattedTimeForCalendar(Calendar calendar) { + return DateFormat.getTimeFormat(mContext).format(calendar.getTime()); + } + + String getTimeSpanStringForHours(Pair<Calendar, Calendar> hours) { + return mContext.getString(R.string.open_time_span, + getFormattedTimeForCalendar(hours.first), + getFormattedTimeForCalendar(hours.second)); + } + /** * Construct a BusinessContextInfo object with the location information of the business. * The format is: diff --git a/InCallUI/tests/src/com/android/incallui/InCallContactInteractionsTest.java b/InCallUI/tests/src/com/android/incallui/InCallContactInteractionsTest.java index 0d03848b6..1c2e9ded7 100644 --- a/InCallUI/tests/src/com/android/incallui/InCallContactInteractionsTest.java +++ b/InCallUI/tests/src/com/android/incallui/InCallContactInteractionsTest.java @@ -25,6 +25,7 @@ import com.android.incallui.InCallContactInteractions.BusinessContextInfo; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.List; import java.util.Locale; /** @@ -137,10 +138,10 @@ public class InCallContactInteractionsTest extends AndroidTestCase { .heading); } - public void testOpeningHours_SingleOpenRange() { + public void testOpeningHours_SingleOpenRangeWhileOpen() { assertEquals("8:00 AM - 8:00 PM", mInCallContactInteractions.constructHoursInfo( - getTestCalendarWithHour(21), + getTestCalendarWithHour(12), Arrays.asList( Pair.create( getTestCalendarWithHour(8), @@ -148,10 +149,10 @@ public class InCallContactInteractionsTest extends AndroidTestCase { .detail); } - public void testOpeningHours_TwoOpenRanges() { + public void testOpeningHours_TwoOpenRangesWhileOpen() { assertEquals("8:00 AM - 10:00 AM, 12:00 PM - 3:00 PM", mInCallContactInteractions.constructHoursInfo( - getTestCalendarWithHour(13), + getTestCalendarWithHour(12), Arrays.asList( Pair.create( getTestCalendarWithHour(8), @@ -162,20 +163,54 @@ public class InCallContactInteractionsTest extends AndroidTestCase { .detail); } - public void testOpeningHours_MultipleOpenRanges() { - assertEquals("8:00 AM - 10:00 AM, 12:00 PM - 3:00 PM, 5:00 PM - 9:00 PM", + public void testOpeningHours_AfterClosedNoTomorrow() { + assertEquals("Closed today at 8:00 PM", mInCallContactInteractions.constructHoursInfo( - getTestCalendarWithHour(13), + getTestCalendarWithHour(21), Arrays.asList( Pair.create( - getTestCalendarWithHour(8), - getTestCalendarWithHour(10)), - Pair.create( - getTestCalendarWithHour(12), - getTestCalendarWithHour(15)), - Pair.create( - getTestCalendarWithHour(17), - getTestCalendarWithHour(21)))) + getTestCalendarWithHour(8), + getTestCalendarWithHour(20)))) + .detail); + } + + public void testMultipleOpenRanges_BeforeOpen() { + assertEquals("Opens today at 8:00 AM", + mInCallContactInteractions.constructHoursInfo( + getTestCalendarWithHour(7), + getMultipleOpeningHours()) + .detail); + } + + public void testMultipleOpenRanges_DuringFirstRange() { + assertEquals("Closes at 10:00 AM", + mInCallContactInteractions.constructHoursInfo( + getTestCalendarWithHour(9), + getMultipleOpeningHours()) + .detail); + } + + public void testMultipleOpenRanges_BeforeMiddleRange() { + assertEquals("Opens today at 12:00 PM", + mInCallContactInteractions.constructHoursInfo( + getTestCalendarWithHour(11), + getMultipleOpeningHours()) + .detail); + } + + public void testMultipleOpeningHours_DuringLastRange() { + assertEquals("Closes at 9:00 PM", + mInCallContactInteractions.constructHoursInfo( + getTestCalendarWithHour(19), + getMultipleOpeningHours()) + .detail); + } + + public void testMultipleOpeningHours_AfterClose() { + assertEquals("Opens tomorrow at 8:00 AM", + mInCallContactInteractions.constructHoursInfo( + getTestCalendarWithHour(22), + getMultipleOpeningHours()) .detail); } @@ -257,4 +292,23 @@ public class InCallContactInteractionsTest extends AndroidTestCase { calendar.add(Calendar.DATE, daysFromToday); return calendar; } + + private List<Pair<Calendar, Calendar>> getMultipleOpeningHours() { + return Arrays.asList( + Pair.create( + getTestCalendarWithHour(8), + getTestCalendarWithHour(10)), + Pair.create( + getTestCalendarWithHour(12), + getTestCalendarWithHour(15)), + Pair.create( + getTestCalendarWithHour(17), + getTestCalendarWithHour(21)), + Pair.create( + getTestCalendarWithHourAndDaysFromToday(8, 1), + getTestCalendarWithHourAndDaysFromToday(10, 1)), + Pair.create( + getTestCalendarWithHourAndDaysFromToday(12, 1), + getTestCalendarWithHourAndDaysFromToday(8, 1))); + } } |