diff options
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/resources/ca.lproj/Foundation.strings | 4 | ||||
| -rw-r--r-- | platform/darwin/resources/de.lproj/Foundation.stringsdict | 16 | ||||
| -rw-r--r-- | platform/darwin/resources/lt.lproj/Foundation.stringsdict | 6 | ||||
| -rw-r--r-- | platform/darwin/resources/ru.lproj/Foundation.strings | 291 | ||||
| -rw-r--r-- | platform/darwin/resources/uk.lproj/Foundation.strings | 291 | ||||
| -rw-r--r-- | platform/darwin/resources/uk.lproj/Foundation.stringsdict | 16 | ||||
| -rw-r--r-- | platform/darwin/resources/vi.lproj/Foundation.stringsdict | 48 | ||||
| -rw-r--r-- | platform/darwin/resources/zh-Hant.lproj/Foundation.strings | 42 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyle.h | 46 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyle.mm | 31 | ||||
| -rw-r--r-- | platform/darwin/test/MGLStyleTests.mm | 5 |
11 files changed, 716 insertions, 80 deletions
diff --git a/platform/darwin/resources/ca.lproj/Foundation.strings b/platform/darwin/resources/ca.lproj/Foundation.strings index e36ea9ed8a..f86442f26f 100644 --- a/platform/darwin/resources/ca.lproj/Foundation.strings +++ b/platform/darwin/resources/ca.lproj/Foundation.strings @@ -1,8 +1,8 @@ /* Clock position format, long: {hours} o’clock */ -"CLOCK_FMT_LONG" = "%@ en punt"; +"CLOCK_FMT_LONG" = "a les %@"; /* Clock position format, medium: {hours} o’clock */ -"CLOCK_FMT_MEDIUM" = "%@ en punt"; +"CLOCK_FMT_MEDIUM" = "a les %@"; /* Clock position format, short: {hours}:00 */ "CLOCK_FMT_SHORT" = "%@:00"; diff --git a/platform/darwin/resources/de.lproj/Foundation.stringsdict b/platform/darwin/resources/de.lproj/Foundation.stringsdict index 776528a99c..fb9073fa96 100644 --- a/platform/darwin/resources/de.lproj/Foundation.stringsdict +++ b/platform/darwin/resources/de.lproj/Foundation.stringsdict @@ -2,6 +2,22 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>COORD_DEG_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@degrees@</string> + <key>degrees</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%d Grad</string> + <key>other</key> + <string>%d Grad</string> + </dict> + </dict> <key>COORD_MIN_LONG</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/platform/darwin/resources/lt.lproj/Foundation.stringsdict b/platform/darwin/resources/lt.lproj/Foundation.stringsdict index e3bb31838a..4ab9d4a8bf 100644 --- a/platform/darwin/resources/lt.lproj/Foundation.stringsdict +++ b/platform/darwin/resources/lt.lproj/Foundation.stringsdict @@ -16,8 +16,6 @@ <string>%d laipsniai</string> <key>few</key> <string>%d laipsniai</string> - <key>many</key> - <string>%d laipsniai</string> <key>other</key> <string>%d laipsnių</string> </dict> @@ -36,8 +34,6 @@ <string>%d minutė</string> <key>few</key> <string>%d minutės</string> - <key>many</key> - <string>%d minutės</string> <key>other</key> <string>%d minučių</string> </dict> @@ -56,8 +52,6 @@ <string>%d sekundė</string> <key>few</key> <string>%d sekundės</string> - <key>many</key> - <string>%d sekundės</string> <key>other</key> <string>%d sekundžių</string> </dict> diff --git a/platform/darwin/resources/ru.lproj/Foundation.strings b/platform/darwin/resources/ru.lproj/Foundation.strings new file mode 100644 index 0000000000..fd9eb04ada --- /dev/null +++ b/platform/darwin/resources/ru.lproj/Foundation.strings @@ -0,0 +1,291 @@ +/* Clock position format, long: {hours} o’clock */ +"CLOCK_FMT_LONG" = "%@ часов"; + +/* Clock position format, medium: {hours} o’clock */ +"CLOCK_FMT_MEDIUM" = "%@ час."; + +/* Clock position format, short: {hours}:00 */ +"CLOCK_FMT_SHORT" = "%@:00"; + +/* East, long */ +"COMPASS_E_LONG" = "восток"; + +/* East, short */ +"COMPASS_E_SHORT" = "В"; + +/* East by north, long */ +"COMPASS_EbN_LONG" = "северо-восток"; + +/* East by north, short */ +"COMPASS_EbN_SHORT" = "СВ"; + +/* East by south, long */ +"COMPASS_EbS_LONG" = "юго-восток"; + +/* East by south, short */ +"COMPASS_EbS_SHORT" = "ЮВ"; + +/* East-northeast, long */ +"COMPASS_ENE_LONG" = "восток-северо-восток"; + +/* East-northeast, short */ +"COMPASS_ENE_SHORT" = "ВСВ"; + +/* East-southeast, long */ +"COMPASS_ESE_LONG" = "юго-юго-восток"; + +/* East-southeast, short */ +"COMPASS_ESE_SHORT" = "ЮЮВ"; + +/* North, long */ +"COMPASS_N_LONG" = "север"; + +/* North, short */ +"COMPASS_N_SHORT" = "С"; + +/* North by east, long */ +"COMPASS_NbE_LONG" = "северо-восток"; + +/* North by east, short */ +"COMPASS_NbE_SHORT" = "СВ"; + +/* North by west, long */ +"COMPASS_NbW_LONG" = "северо-запад"; + +/* North by west, short */ +"COMPASS_NbW_SHORT" = "СЗ"; + +/* Northeast, long */ +"COMPASS_NE_LONG" = "северо-восток"; + +/* Northeast, short */ +"COMPASS_NE_SHORT" = "СВ"; + +/* Northeast by east, long */ +"COMPASS_NEbE_LONG" = "восток-северо-восток"; + +/* Northeast by east, short */ +"COMPASS_NEbE_SHORT" = "ВСВ"; + +/* Northeast by north, long */ +"COMPASS_NEbN_LONG" = "северо-северо-восток"; + +/* Northeast by north, short */ +"COMPASS_NEbN_SHORT" = "ССВ"; + +/* North-northeast, long */ +"COMPASS_NNE_LONG" = "северо-северо-восток"; + +/* North-northeast, short */ +"COMPASS_NNE_SHORT" = "ССВ"; + +/* North-northwest, long */ +"COMPASS_NNW_LONG" = "северо-северо-запад"; + +/* North-northwest, short */ +"COMPASS_NNW_SHORT" = "ССЗ"; + +/* Northwest, long */ +"COMPASS_NW_LONG" = "северо-запад"; + +/* Northwest, short */ +"COMPASS_NW_SHORT" = "СЗ"; + +/* Northwest by north, long */ +"COMPASS_NWbN_LONG" = "северо-северо-запад"; + +/* Northwest by north, short */ +"COMPASS_NWbN_SHORT" = "ССЗ"; + +/* Northwest by west, long */ +"COMPASS_NWbW_LONG" = "запад-северо-запад"; + +/* Northwest by west, short */ +"COMPASS_NWbW_SHORT" = "ЗСЗ"; + +/* South, long */ +"COMPASS_S_LONG" = "юг"; + +/* South, short */ +"COMPASS_S_SHORT" = "Ю"; + +/* South by east, long */ +"COMPASS_SbE_LONG" = "юго-восток"; + +/* South by east, short */ +"COMPASS_SbE_SHORT" = "ЮВ"; + +/* South by west, long */ +"COMPASS_SbW_LONG" = "юго-запад"; + +/* South by west, short */ +"COMPASS_SbW_SHORT" = "ЮЗ"; + +/* Southeast, long */ +"COMPASS_SE_LONG" = "юго-восток"; + +/* Southeast, short */ +"COMPASS_SE_SHORT" = "ЮВ"; + +/* Southeast by east, long */ +"COMPASS_SEbE_LONG" = "восток-юго-восток"; + +/* Southeast by east, short */ +"COMPASS_SEbE_SHORT" = "ВЮВ"; + +/* Southeast by south, long */ +"COMPASS_SEbS_LONG" = "юго-юго-восток"; + +/* Southeast by south, short */ +"COMPASS_SEbS_SHORT" = "ЮЮВ"; + +/* South-southeast, long */ +"COMPASS_SSE_LONG" = "юго-юго-восток"; + +/* South-southeast, short */ +"COMPASS_SSE_SHORT" = "ЮЮВ"; + +/* South-southwest, long */ +"COMPASS_SSW_LONG" = "юго-юго-запад"; + +/* South-southwest, short */ +"COMPASS_SSW_SHORT" = "ЮЮЗ"; + +/* Southwest, long */ +"COMPASS_SW_LONG" = "юго-запад"; + +/* Southwest, short */ +"COMPASS_SW_SHORT" = "ЮЗ"; + +/* Southwest by south, long */ +"COMPASS_SWbS_LONG" = "юго-юго-запад"; + +/* Southwest by south, short */ +"COMPASS_SWbS_SHORT" = "ЮЮЗ"; + +/* Southwest by west, long */ +"COMPASS_SWbW_LONG" = "восток-юго-восток"; + +/* Southwest by west, short */ +"COMPASS_SWbW_SHORT" = "ВЮВ"; + +/* West, long */ +"COMPASS_W_LONG" = "запад"; + +/* West, short */ +"COMPASS_W_SHORT" = "З"; + +/* West by north, long */ +"COMPASS_WbN_LONG" = "северо-запад"; + +/* West by north, short */ +"COMPASS_WbN_SHORT" = "СЗ"; + +/* West by south, long */ +"COMPASS_WbS_LONG" = "юго-запад"; + +/* West by south, short */ +"COMPASS_WbS_SHORT" = "ЮГ"; + +/* West-northwest, long */ +"COMPASS_WNW_LONG" = "запад-северо-запад"; + +/* West-northwest, short */ +"COMPASS_WNW_SHORT" = "ЗСЗ"; + +/* West-southwest, long */ +"COMPASS_WSW_LONG" = "запад-юго-запад"; + +/* West-southwest, short */ +"COMPASS_WSW_SHORT" = "ЗЮЗ"; + +/* Degrees format, long */ +"COORD_DEG_LONG" = "%d градус(ов)"; + +/* Degrees format, medium: {degrees} */ +"COORD_DEG_MEDIUM" = "%d°"; + +/* Degrees format, short: {degrees} */ +"COORD_DEG_SHORT" = "%d°"; + +/* Coordinate format, long: {degrees}{minutes} */ +"COORD_DM_LONG" = "%1$@ и %2$@"; + +/* Coordinate format, medium: {degrees}{minutes} */ +"COORD_DM_MEDIUM" = "%1$@%2$@"; + +/* Coordinate format, short: {degrees}{minutes} */ +"COORD_DM_SHORT" = "%1$@%2$@"; + +/* Coordinate format, long: {degrees}{minutes}{seconds} */ +"COORD_DMS_LONG" = "%1$@, %2$@, и %3$@"; + +/* Coordinate format, medium: {degrees}{minutes}{seconds} */ +"COORD_DMS_MEDIUM" = "%1$@%2$@%3$@"; + +/* Coordinate format, short: {degrees}{minutes}{seconds} */ +"COORD_DMS_SHORT" = "%1$@%2$@%3$@"; + +/* East longitude format, long: {longitude} */ +"COORD_E_LONG" = "%@восточной долготы"; + +/* East longitude format, medium: {longitude} */ +"COORD_E_MEDIUM" = "%@восточной долготы"; + +/* East longitude format, short: {longitude} */ +"COORD_E_SHORT" = "%@E"; + +/* Coordinate pair format, long: {latitude}, {longitude} */ +"COORD_FMT_LONG" = "%1$@,%2$@"; + +/* Coordinate pair format, medium: {latitude}, {longitude} */ +"COORD_FMT_MEDIUM" = "%1$@, %2$@"; + +/* Coordinate pair format, short: {latitude}, {longitude} */ +"COORD_FMT_SHORT" = "%1$@, %2$@"; + +/* Minutes format, long */ +"COORD_MIN_LONG" = "%d минут(а)"; + +/* Minutes format, medium: {minutes} */ +"COORD_MIN_MEDIUM" = "%d′"; + +/* Minutes format, short: {minutes} */ +"COORD_MIN_SHORT" = "%d′"; + +/* North latitude format, long: {latitude} */ +"COORD_N_LONG" = "%@северной широты"; + +/* North latitude format, medium: {latitude} */ +"COORD_N_MEDIUM" = "%@северной широты"; + +/* North latitude format, short: {latitude} */ +"COORD_N_SHORT" = "%@N"; + +/* South latitude format, long: {latitude} */ +"COORD_S_LONG" = "%@южной широты"; + +/* South latitude format, medium: {latitude} */ +"COORD_S_MEDIUM" = "%@южной широты"; + +/* South latitude format, short: {latitude} */ +"COORD_S_SHORT" = "%@S"; + +/* Seconds format, long */ +"COORD_SEC_LONG" = "%d секунд(а)"; + +/* Seconds format, medium: {seconds} */ +"COORD_SEC_MEDIUM" = "%d″"; + +/* Seconds format, short: {seconds} */ +"COORD_SEC_SHORT" = "%d″"; + +/* West longitude format, long: {longitude} */ +"COORD_W_LONG" = "%@западной долготы"; + +/* West longitude format, medium: {longitude} */ +"COORD_W_MEDIUM" = "%@западной долготы"; + +/* West longitude format, short: {longitude} */ +"COORD_W_SHORT" = "%@W"; + diff --git a/platform/darwin/resources/uk.lproj/Foundation.strings b/platform/darwin/resources/uk.lproj/Foundation.strings new file mode 100644 index 0000000000..32a006829f --- /dev/null +++ b/platform/darwin/resources/uk.lproj/Foundation.strings @@ -0,0 +1,291 @@ +/* Clock position format, long: {hours} o’clock */ +"CLOCK_FMT_LONG" = "%@год."; + +/* Clock position format, medium: {hours} o’clock */ +"CLOCK_FMT_MEDIUM" = "%@г."; + +/* Clock position format, short: {hours}:00 */ +"CLOCK_FMT_SHORT" = "%@:00"; + +/* East, long */ +"COMPASS_E_LONG" = "схід"; + +/* East, short */ +"COMPASS_E_SHORT" = "Сх"; + +/* East by north, long */ +"COMPASS_EbN_LONG" = "північний схід"; + +/* East by north, short */ +"COMPASS_EbN_SHORT" = "ПнСх"; + +/* East by south, long */ +"COMPASS_EbS_LONG" = "південний схід"; + +/* East by south, short */ +"COMPASS_EbS_SHORT" = "ПдСх"; + +/* East-northeast, long */ +"COMPASS_ENE_LONG" = "схід - північний схід"; + +/* East-northeast, short */ +"COMPASS_ENE_SHORT" = "Сх-ПнСх"; + +/* East-southeast, long */ +"COMPASS_ESE_LONG" = "схід - південний схід"; + +/* East-southeast, short */ +"COMPASS_ESE_SHORT" = "Сх-ПдСх"; + +/* North, long */ +"COMPASS_N_LONG" = "північ"; + +/* North, short */ +"COMPASS_N_SHORT" = "Пн"; + +/* North by east, long */ +"COMPASS_NbE_LONG" = "північний схід"; + +/* North by east, short */ +"COMPASS_NbE_SHORT" = "ПнСх"; + +/* North by west, long */ +"COMPASS_NbW_LONG" = "північний захід"; + +/* North by west, short */ +"COMPASS_NbW_SHORT" = "ПнЗх"; + +/* Northeast, long */ +"COMPASS_NE_LONG" = "північний схід"; + +/* Northeast, short */ +"COMPASS_NE_SHORT" = "ПнСх"; + +/* Northeast by east, long */ +"COMPASS_NEbE_LONG" = "північний схід - схід"; + +/* Northeast by east, short */ +"COMPASS_NEbE_SHORT" = "ПнСх-Сх"; + +/* Northeast by north, long */ +"COMPASS_NEbN_LONG" = "північний счхід - північ"; + +/* Northeast by north, short */ +"COMPASS_NEbN_SHORT" = "ПнСх-Пн"; + +/* North-northeast, long */ +"COMPASS_NNE_LONG" = "північ - північний схід"; + +/* North-northeast, short */ +"COMPASS_NNE_SHORT" = "Пн-ПнСх"; + +/* North-northwest, long */ +"COMPASS_NNW_LONG" = "північ - північний захід"; + +/* North-northwest, short */ +"COMPASS_NNW_SHORT" = "Пн-ПнЗх"; + +/* Northwest, long */ +"COMPASS_NW_LONG" = "північний захід"; + +/* Northwest, short */ +"COMPASS_NW_SHORT" = "ПнЗх"; + +/* Northwest by north, long */ +"COMPASS_NWbN_LONG" = "північний захід - північ"; + +/* Northwest by north, short */ +"COMPASS_NWbN_SHORT" = "ПнЗх-Пн"; + +/* Northwest by west, long */ +"COMPASS_NWbW_LONG" = "північний захід - захід"; + +/* Northwest by west, short */ +"COMPASS_NWbW_SHORT" = "ПнЗх-Зх"; + +/* South, long */ +"COMPASS_S_LONG" = "південь"; + +/* South, short */ +"COMPASS_S_SHORT" = "Пд"; + +/* South by east, long */ +"COMPASS_SbE_LONG" = "південний схід"; + +/* South by east, short */ +"COMPASS_SbE_SHORT" = "ПдСх"; + +/* South by west, long */ +"COMPASS_SbW_LONG" = "південний захід"; + +/* South by west, short */ +"COMPASS_SbW_SHORT" = "ПдЗх"; + +/* Southeast, long */ +"COMPASS_SE_LONG" = "південний схід"; + +/* Southeast, short */ +"COMPASS_SE_SHORT" = "ПдСх"; + +/* Southeast by east, long */ +"COMPASS_SEbE_LONG" = "південний схід - схід"; + +/* Southeast by east, short */ +"COMPASS_SEbE_SHORT" = "ПдСх-Сх"; + +/* Southeast by south, long */ +"COMPASS_SEbS_LONG" = "південний схід - південь"; + +/* Southeast by south, short */ +"COMPASS_SEbS_SHORT" = "ПдСх-Пд"; + +/* South-southeast, long */ +"COMPASS_SSE_LONG" = "південь - південний схід"; + +/* South-southeast, short */ +"COMPASS_SSE_SHORT" = "Пд-ПдСх"; + +/* South-southwest, long */ +"COMPASS_SSW_LONG" = "південь - південний захід"; + +/* South-southwest, short */ +"COMPASS_SSW_SHORT" = "Пд-ПдЗх"; + +/* Southwest, long */ +"COMPASS_SW_LONG" = "південний захід"; + +/* Southwest, short */ +"COMPASS_SW_SHORT" = "ПдЗх"; + +/* Southwest by south, long */ +"COMPASS_SWbS_LONG" = "південний захід - південь"; + +/* Southwest by south, short */ +"COMPASS_SWbS_SHORT" = "ПдЗх-Пд"; + +/* Southwest by west, long */ +"COMPASS_SWbW_LONG" = "південний захід - захід"; + +/* Southwest by west, short */ +"COMPASS_SWbW_SHORT" = "ПдЗх-Зх"; + +/* West, long */ +"COMPASS_W_LONG" = "захід"; + +/* West, short */ +"COMPASS_W_SHORT" = "Зх"; + +/* West by north, long */ +"COMPASS_WbN_LONG" = "північний захід"; + +/* West by north, short */ +"COMPASS_WbN_SHORT" = "ПнЗх"; + +/* West by south, long */ +"COMPASS_WbS_LONG" = "південний захід"; + +/* West by south, short */ +"COMPASS_WbS_SHORT" = "ПдЗх"; + +/* West-northwest, long */ +"COMPASS_WNW_LONG" = "захід - північний захід"; + +/* West-northwest, short */ +"COMPASS_WNW_SHORT" = "Зх-ПнЗх"; + +/* West-southwest, long */ +"COMPASS_WSW_LONG" = "захід - південний захід"; + +/* West-southwest, short */ +"COMPASS_WSW_SHORT" = "Зх-ПдЗх"; + +/* Degrees format, long */ +"COORD_DEG_LONG" = "%d градус(ів)"; + +/* Degrees format, medium: {degrees} */ +"COORD_DEG_MEDIUM" = "%d°"; + +/* Degrees format, short: {degrees} */ +"COORD_DEG_SHORT" = "%d°"; + +/* Coordinate format, long: {degrees}{minutes} */ +"COORD_DM_LONG" = "%1$@ та %2$@"; + +/* Coordinate format, medium: {degrees}{minutes} */ +"COORD_DM_MEDIUM" = "%1$@%2$@"; + +/* Coordinate format, short: {degrees}{minutes} */ +"COORD_DM_SHORT" = "%1$@%2$@"; + +/* Coordinate format, long: {degrees}{minutes}{seconds} */ +"COORD_DMS_LONG" = "%1$@, %2$@, та %3$@"; + +/* Coordinate format, medium: {degrees}{minutes}{seconds} */ +"COORD_DMS_MEDIUM" = "%1$@%2$@%3$@"; + +/* Coordinate format, short: {degrees}{minutes}{seconds} */ +"COORD_DMS_SHORT" = "%1$@%2$@%3$@"; + +/* East longitude format, long: {longitude} */ +"COORD_E_LONG" = "%@ східної довготи"; + +/* East longitude format, medium: {longitude} */ +"COORD_E_MEDIUM" = "%@ східної довготи"; + +/* East longitude format, short: {longitude} */ +"COORD_E_SHORT" = "%@Сх"; + +/* Coordinate pair format, long: {latitude}, {longitude} */ +"COORD_FMT_LONG" = "%1$@, %2$@"; + +/* Coordinate pair format, medium: {latitude}, {longitude} */ +"COORD_FMT_MEDIUM" = "%1$@, %2$@"; + +/* Coordinate pair format, short: {latitude}, {longitude} */ +"COORD_FMT_SHORT" = "%1$@, %2$@"; + +/* Minutes format, long */ +"COORD_MIN_LONG" = "%d хвилин(а)"; + +/* Minutes format, medium: {minutes} */ +"COORD_MIN_MEDIUM" = "%d′"; + +/* Minutes format, short: {minutes} */ +"COORD_MIN_SHORT" = "%d′"; + +/* North latitude format, long: {latitude} */ +"COORD_N_LONG" = "%@ північної широти"; + +/* North latitude format, medium: {latitude} */ +"COORD_N_MEDIUM" = "%@ північної широти"; + +/* North latitude format, short: {latitude} */ +"COORD_N_SHORT" = "%@Пн"; + +/* South latitude format, long: {latitude} */ +"COORD_S_LONG" = "%@ південної широти"; + +/* South latitude format, medium: {latitude} */ +"COORD_S_MEDIUM" = "%@ південної широти"; + +/* South latitude format, short: {latitude} */ +"COORD_S_SHORT" = "%@Пд"; + +/* Seconds format, long */ +"COORD_SEC_LONG" = "%d секунд(а)"; + +/* Seconds format, medium: {seconds} */ +"COORD_SEC_MEDIUM" = "%d″"; + +/* Seconds format, short: {seconds} */ +"COORD_SEC_SHORT" = "%d″"; + +/* West longitude format, long: {longitude} */ +"COORD_W_LONG" = "%@ західної довготи"; + +/* West longitude format, medium: {longitude} */ +"COORD_W_MEDIUM" = "%@ західної довготи"; + +/* West longitude format, short: {longitude} */ +"COORD_W_SHORT" = "%@Зх"; + diff --git a/platform/darwin/resources/uk.lproj/Foundation.stringsdict b/platform/darwin/resources/uk.lproj/Foundation.stringsdict index f35f0516e1..fdad193d4d 100644 --- a/platform/darwin/resources/uk.lproj/Foundation.stringsdict +++ b/platform/darwin/resources/uk.lproj/Foundation.stringsdict @@ -16,10 +16,8 @@ <string>%d градус</string> <key>few</key> <string>%d градуси</string> - <key>many</key> - <string>%d градусів</string> <key>other</key> - <string>%d градуса</string> + <string>%d градусів</string> </dict> </dict> <key>COORD_MIN_LONG</key> @@ -33,13 +31,11 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%d мінута</string> + <string>%d хвилина</string> <key>few</key> - <string>%d мінути</string> - <key>many</key> - <string>%d мінут</string> + <string>%d хвилини</string> <key>other</key> - <string>%d мінути</string> + <string>%d хвилин</string> </dict> </dict> <key>COORD_SEC_LONG</key> @@ -56,10 +52,8 @@ <string>%d секунда</string> <key>few</key> <string>%d секунди</string> - <key>many</key> - <string>%d секунд</string> <key>other</key> - <string>%d секунди</string> + <string>%d секунд</string> </dict> </dict> </dict> diff --git a/platform/darwin/resources/vi.lproj/Foundation.stringsdict b/platform/darwin/resources/vi.lproj/Foundation.stringsdict new file mode 100644 index 0000000000..d85707f7ff --- /dev/null +++ b/platform/darwin/resources/vi.lproj/Foundation.stringsdict @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>COORD_DEG_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@degrees@</string> + <key>degrees</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>other</key> + <string>%d độ</string> + </dict> + </dict> + <key>COORD_MIN_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@minutes@</string> + <key>minutes</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>other</key> + <string>%d phút</string> + </dict> + </dict> + <key>COORD_SEC_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@seconds@</string> + <key>seconds</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>other</key> + <string>%d giây</string> + </dict> + </dict> +</dict> +</plist> diff --git a/platform/darwin/resources/zh-Hant.lproj/Foundation.strings b/platform/darwin/resources/zh-Hant.lproj/Foundation.strings index 41b1d2baae..8a02bcfac0 100644 --- a/platform/darwin/resources/zh-Hant.lproj/Foundation.strings +++ b/platform/darwin/resources/zh-Hant.lproj/Foundation.strings @@ -1,4 +1,4 @@ -/* Clock position format, long: {hours} o’clock */ +/* Clock position format, long: {hours} o’clock */ "CLOCK_FMT_LONG" = "%@點"; /* Clock position format, medium: {hours} o’clock */ @@ -26,16 +26,16 @@ "COMPASS_EbS_SHORT" = "東微南"; /* East-northeast, long */ -"COMPASS_ENE_LONG" = "東北偏東"; +"COMPASS_ENE_LONG" = "東北東"; /* East-northeast, short */ -"COMPASS_ENE_SHORT" = "東北偏東"; +"COMPASS_ENE_SHORT" = "東北東"; /* East-southeast, long */ -"COMPASS_ESE_LONG" = "東南偏東"; +"COMPASS_ESE_LONG" = "東南東"; /* East-southeast, short */ -"COMPASS_ESE_SHORT" = "東南偏東"; +"COMPASS_ESE_SHORT" = "東南東"; /* North, long */ "COMPASS_N_LONG" = "北"; @@ -74,16 +74,16 @@ "COMPASS_NEbN_SHORT" = "東北微北"; /* North-northeast, long */ -"COMPASS_NNE_LONG" = "東北偏北"; +"COMPASS_NNE_LONG" = "北北東"; /* North-northeast, short */ -"COMPASS_NNE_SHORT" = "東北偏北"; +"COMPASS_NNE_SHORT" = "北北東"; /* North-northwest, long */ -"COMPASS_NNW_LONG" = "西北偏北"; +"COMPASS_NNW_LONG" = "北北西"; /* North-northwest, short */ -"COMPASS_NNW_SHORT" = "西北偏北"; +"COMPASS_NNW_SHORT" = "北北西"; /* Northwest, long */ "COMPASS_NW_LONG" = "西北"; @@ -140,16 +140,16 @@ "COMPASS_SEbS_SHORT" = "東南微南"; /* South-southeast, long */ -"COMPASS_SSE_LONG" = "東南偏南"; +"COMPASS_SSE_LONG" = "南南東"; /* South-southeast, short */ -"COMPASS_SSE_SHORT" = "東南偏南"; +"COMPASS_SSE_SHORT" = "南南東"; /* South-southwest, long */ -"COMPASS_SSW_LONG" = "西南偏南"; +"COMPASS_SSW_LONG" = "南南西"; /* South-southwest, short */ -"COMPASS_SSW_SHORT" = "西南偏南"; +"COMPASS_SSW_SHORT" = "南南西"; /* Southwest, long */ "COMPASS_SW_LONG" = "西南"; @@ -158,16 +158,16 @@ "COMPASS_SW_SHORT" = "西南"; /* Southwest by south, long */ -"COMPASS_SWbS_LONG" = "西南偏南"; +"COMPASS_SWbS_LONG" = "西南微南"; /* Southwest by south, short */ -"COMPASS_SWbS_SHORT" = "西南偏南"; +"COMPASS_SWbS_SHORT" = "西南微南"; /* Southwest by west, long */ -"COMPASS_SWbW_LONG" = "西南偏西"; +"COMPASS_SWbW_LONG" = "西南微西"; /* Southwest by west, short */ -"COMPASS_SWbW_SHORT" = "西南偏西"; +"COMPASS_SWbW_SHORT" = "西南微西"; /* West, long */ "COMPASS_W_LONG" = "西"; @@ -188,16 +188,16 @@ "COMPASS_WbS_SHORT" = "西微南"; /* West-northwest, long */ -"COMPASS_WNW_LONG" = "西北偏西"; +"COMPASS_WNW_LONG" = "西北西"; /* West-northwest, short */ -"COMPASS_WNW_SHORT" = "西北偏西"; +"COMPASS_WNW_SHORT" = "西北西"; /* West-southwest, long */ -"COMPASS_WSW_LONG" = "西南偏西"; +"COMPASS_WSW_LONG" = "西南西"; /* West-southwest, short */ -"COMPASS_WSW_SHORT" = "西南偏西"; +"COMPASS_WSW_SHORT" = "西南西"; /* Degrees format, long */ "COORD_DEG_LONG" = "%d度"; diff --git a/platform/darwin/src/MGLStyle.h b/platform/darwin/src/MGLStyle.h index 98be70be9c..0b360de8fc 100644 --- a/platform/darwin/src/MGLStyle.h +++ b/platform/darwin/src/MGLStyle.h @@ -233,66 +233,38 @@ MGL_EXPORT + (NSURL *)satelliteStreetsStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to the current version of the + Returns the URL to version 2 of the <a href="https://www.mapbox.com/blog/live-traffic-maps/">Mapbox Traffic Day</a> style. - Traffic Day color-codes roads based on live traffic congestion data. Traffic - data is currently available in - <a href="https://www.mapbox.com/api-documentation/pages/traffic-countries.html">these select countries</a>. - - @warning The return value may change in a future release of the SDK. If you use - any feature that depends on a specific aspect of a default style – for - instance, the minimum zoom level that includes roads – use the - `-trafficDayStyleURLWithVersion:` method instead. Such details may change - significantly from version to version. */ -+ (NSURL *)trafficDayStyleURL; ++ (NSURL *)trafficDayStyleURL __attribute__((deprecated("Create an NSURL object with the string “mapbox://styles/mapbox/traffic-day-v2”."))); /** Returns the URL to the given version of the <a href="https://www.mapbox.com/blog/live-traffic-maps/">Mapbox Traffic Day</a> style as of publication. - - Traffic Day color-codes roads based on live traffic congestion data. Traffic - data is currently available in - <a href="https://www.mapbox.com/api-documentation/pages/traffic-countries.html">these select countries</a>. - + @param version A specific version of the style. */ -+ (NSURL *)trafficDayStyleURLWithVersion:(NSInteger)version; ++ (NSURL *)trafficDayStyleURLWithVersion:(NSInteger)version __attribute__((deprecated("Create an NSURL object with the string “mapbox://styles/mapbox/traffic-day-v2”.")));; /** - Returns the URL to the current version of the + Returns the URL to the version 2 of the <a href="https://www.mapbox.com/blog/live-traffic-maps/">Mapbox Traffic Night</a> style. - Traffic Night color-codes roads based on live traffic congestion data and is - designed to maximize legibility in low-light situations. Traffic data is - currently available in - <a href="https://www.mapbox.com/api-documentation/pages/traffic-countries.html">these select countries</a>. - - @warning The return value may change in a future release of the SDK. If you use - any feature that depends on a specific aspect of a default style – for - instance, the minimum zoom level that includes roads – use the - `-trafficNightStyleURLWithVersion:` method instead. Such details may change - significantly from version to version. */ -+ (NSURL *)trafficNightStyleURL; ++ (NSURL *)trafficNightStyleURL __attribute__((deprecated("Create an NSURL object with the string “mapbox://styles/mapbox/traffic-night-v2”."))); /** - Returns the URL to the given version of the + Returns the URL to to the version 2 of the <a href="https://www.mapbox.com/blog/live-traffic-maps/">Mapbox Traffic Night</a> style as of publication. - - Traffic Night color-codes roads based on live traffic congestion data and is - designed to maximize legibility in low-light situations. Traffic data is - currently available in - <a href="https://www.mapbox.com/api-documentation/pages/traffic-countries.html">these select countries</a>. - + @param version A specific version of the style. */ -+ (NSURL *)trafficNightStyleURLWithVersion:(NSInteger)version; ++ (NSURL *)trafficNightStyleURLWithVersion:(NSInteger)version __attribute__((deprecated("Create an NSURL object with the string “mapbox://styles/mapbox/traffic-night-v2”."))); #pragma mark Accessing Metadata About the Style diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 94f199fd21..52efc7a85a 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -108,8 +108,6 @@ MGL_DEFINE_STYLE(light, light) MGL_DEFINE_STYLE(dark, dark) MGL_DEFINE_STYLE(satellite, satellite) MGL_DEFINE_STYLE(satelliteStreets, satellite-streets) -MGL_DEFINE_STYLE(trafficDay, traffic-day) -MGL_DEFINE_STYLE(trafficNight, traffic-night) // Make sure all the styles listed in mbgl::util::default_styles::orderedStyles // are defined above and also declared in MGLStyle.h. @@ -136,6 +134,35 @@ static NSURL *MGLStyleURL_emerald; return MGLStyleURL_emerald; } +// Traffic Day is no longer getting new versions as a default style, so the current version is hard-coded here. +static NSURL *MGLStyleURL_trafficDay; ++ (NSURL *)trafficDayStyleURL { + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + MGLStyleURL_trafficDay = [NSURL URLWithString:@"mapbox://styles/mapbox/traffic-day-v2"]; + }); + return MGLStyleURL_trafficDay; +} + ++ (NSURL *)trafficDayStyleURLWithVersion:(NSInteger)version { + return [NSURL URLWithString:[@"mapbox://styles/mapbox/traffic-day-v" stringByAppendingFormat:@"%li", (long)version]]; +} + +// Traffic Night is no longer getting new versions as a default style, so the current version is hard-coded here. +static NSURL *MGLStyleURL_trafficNight; ++ (NSURL *)trafficNightStyleURL { + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + MGLStyleURL_trafficNight = [NSURL URLWithString:@"mapbox://styles/mapbox/traffic-night-v2"]; + }); + return MGLStyleURL_trafficNight; +} + ++ (NSURL *)trafficNightStyleURLWithVersion:(NSInteger)version { + return [NSURL URLWithString:[@"mapbox://styles/mapbox/traffic-night-v" stringByAppendingFormat:@"%li", (long)version]]; +} + + #pragma mark - - (instancetype)initWithRawStyle:(mbgl::style::Style *)rawStyle mapView:(MGLMapView *)mapView { diff --git a/platform/darwin/test/MGLStyleTests.mm b/platform/darwin/test/MGLStyleTests.mm index 608cfdfd2d..8f610e338c 100644 --- a/platform/darwin/test/MGLStyleTests.mm +++ b/platform/darwin/test/MGLStyleTests.mm @@ -99,6 +99,8 @@ @(mbgl::util::default_styles::satelliteStreets.url)); XCTAssertEqualObjects([MGLStyle satelliteStreetsStyleURLWithVersion:99].absoluteString, @"mapbox://styles/mapbox/satellite-streets-v99"); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" XCTAssertEqualObjects([MGLStyle trafficDayStyleURLWithVersion:mbgl::util::default_styles::trafficDay.currentVersion].absoluteString, @(mbgl::util::default_styles::trafficDay.url)); XCTAssertEqualObjects([MGLStyle trafficDayStyleURLWithVersion:99].absoluteString, @@ -107,6 +109,7 @@ @(mbgl::util::default_styles::trafficNight.url)); XCTAssertEqualObjects([MGLStyle trafficNightStyleURLWithVersion:99].absoluteString, @"mapbox://styles/mapbox/traffic-night-v99"); +#pragma clang diagnostic pop static_assert(8 == mbgl::util::default_styles::numOrderedStyles, "MGLStyleTests isn’t testing all the styles in mbgl::util::default_styles."); @@ -140,7 +143,7 @@ NSString *styleHeader = self.stringWithContentsOfStyleHeader; NSError *versionedMethodError; - NSString *versionedMethodExpressionString = @(R"RE(^\+\s*\(NSURL\s*\*\s*\)\s*\w+StyleURLWithVersion\s*:\s*\(\s*NSInteger\s*\)\s*version\s*;)RE"); + NSString *versionedMethodExpressionString = @(R"RE(^\+\s*\(NSURL\s*\*\s*\)\s*\w+StyleURLWithVersion\s*:\s*\(\s*NSInteger\s*\)\s*version\s*\b)RE"); NSRegularExpression *versionedMethodExpression = [NSRegularExpression regularExpressionWithPattern:versionedMethodExpressionString options:NSRegularExpressionAnchorsMatchLines error:&versionedMethodError]; XCTAssertNil(versionedMethodError, @"Error compiling regular expression to search for versioned methods."); NSUInteger numVersionedMethodDeclarations = [versionedMethodExpression numberOfMatchesInString:styleHeader options:0 range:NSMakeRange(0, styleHeader.length)]; |