diff --git a/voice/zh-hk/voice/and.ogg b/voice/zh-hk/voice/and.ogg index 68267acdd0..fcd309442b 100644 Binary files a/voice/zh-hk/voice/and.ogg and b/voice/zh-hk/voice/and.ogg differ diff --git a/voice/zh-hk/voice/enter.ogg b/voice/zh-hk/voice/enter.ogg new file mode 100644 index 0000000000..caa745f878 Binary files /dev/null and b/voice/zh-hk/voice/enter.ogg differ diff --git a/voice/zh-hk/voice/exceed_limit.ogg b/voice/zh-hk/voice/exceed_limit.ogg index 7f735f4f70..384f54c933 100644 Binary files a/voice/zh-hk/voice/exceed_limit.ogg and b/voice/zh-hk/voice/exceed_limit.ogg differ diff --git a/voice/zh-hk/voice/follow.ogg b/voice/zh-hk/voice/follow.ogg index e6bbe973c8..d3a0cb8574 100644 Binary files a/voice/zh-hk/voice/follow.ogg and b/voice/zh-hk/voice/follow.ogg differ diff --git a/voice/zh-hk/voice/go_ahead.ogg b/voice/zh-hk/voice/go_ahead.ogg index fa514c1998..1e641a188c 100644 Binary files a/voice/zh-hk/voice/go_ahead.ogg and b/voice/zh-hk/voice/go_ahead.ogg differ diff --git a/voice/zh-hk/voice/less_a_minute.ogg b/voice/zh-hk/voice/less_a_minute.ogg index f8acbc9592..be09ad49c9 100644 Binary files a/voice/zh-hk/voice/less_a_minute.ogg and b/voice/zh-hk/voice/less_a_minute.ogg differ diff --git a/voice/zh-hk/voice/prepare_roundabout.ogg b/voice/zh-hk/voice/prepare_roundabout.ogg index ea22c1a33d..30136c027b 100644 Binary files a/voice/zh-hk/voice/prepare_roundabout.ogg and b/voice/zh-hk/voice/prepare_roundabout.ogg differ diff --git a/voice/zh-hk/voice/roundabout.ogg b/voice/zh-hk/voice/roundabout.ogg index a9bd38a6d3..8a917657a0 100644 Binary files a/voice/zh-hk/voice/roundabout.ogg and b/voice/zh-hk/voice/roundabout.ogg differ diff --git a/voice/zh-hk/voice/route_calculate.ogg b/voice/zh-hk/voice/route_calculate.ogg index cf9167d5cc..34a363343e 100644 Binary files a/voice/zh-hk/voice/route_calculate.ogg and b/voice/zh-hk/voice/route_calculate.ogg differ diff --git a/voice/zh-hk/voice/stop.ogg b/voice/zh-hk/voice/stop.ogg index 8f1daa69f3..2270f825e4 100644 Binary files a/voice/zh-hk/voice/stop.ogg and b/voice/zh-hk/voice/stop.ogg differ diff --git a/voice/zh-hk/voice/take.ogg b/voice/zh-hk/voice/take.ogg index 7cc5319d2f..e66a2d0b9f 100644 Binary files a/voice/zh-hk/voice/take.ogg and b/voice/zh-hk/voice/take.ogg differ diff --git a/voice/zh-hk/voice/toward.ogg b/voice/zh-hk/voice/toward.ogg index cee277c754..6169979d3e 100644 Binary files a/voice/zh-hk/voice/toward.ogg and b/voice/zh-hk/voice/toward.ogg differ diff --git a/voice/zh-hk/voice/traffic_calming.ogg b/voice/zh-hk/voice/traffic_calming.ogg index 9cbce2842e..77ec3eb1f1 100644 Binary files a/voice/zh-hk/voice/traffic_calming.ogg and b/voice/zh-hk/voice/traffic_calming.ogg differ diff --git a/voice/zh-hk/zh-hk_tts.js b/voice/zh-hk/zh-hk_tts.js index 0e5b6f4d61..ac29f0bc60 100644 --- a/voice/zh-hk/zh-hk_tts.js +++ b/voice/zh-hk/zh-hk_tts.js @@ -23,10 +23,11 @@ function populateDictionary(tts) { dictionary["distance"] = tts ? "距離" : "distance.ogg"; // LEFT/RIGHT - dictionary["prepare"] = tts ? "請準備" : "prepare.ogg"; + //dictionary["prepare"] = tts ? "請準備" : "prepare.ogg"; dictionary["after"] = tts ? "後" : "after.ogg"; dictionary["in"] = tts ? "在" : "in.ogg"; + dictionary["left"] = tts ? "左轉" : "left.ogg"; dictionary["left_sh"] = tts ? "向左急轉" : "left_sh.ogg"; dictionary["left_sl"] = tts ? "稍向左轉" : "left_sl.ogg"; @@ -46,13 +47,13 @@ function populateDictionary(tts) { dictionary["make_uturn_wp"] = tts ? "可以嘅話, 請掉頭" : "make_uturn_wp.ogg"; // ROUNDABOUTS - dictionary["prepare_roundabout"] = tts ? "後進入迴旋處" : "prepare_roundabout.ogg"; - dictionary["roundabout"] = tts ? "後進入迴旋處, 然後在" : "roundabout.ogg"; - dictionary["then"] = tts ? "然後" : "then.ogg"; - dictionary["and"] = tts ? "同埋" : "and.ogg"; - dictionary["take"] = tts ? "行" : "take.ogg"; + dictionary["prepare_roundabout"] = tts ? "進入迴旋處" : "prepare_roundabout.ogg"; + dictionary["roundabout"] = tts ? "駛入迴旋處" : "roundabout.ogg"; + //dictionary["then"] = tts ? "然後" : "then.ogg"; + dictionary["and"] = tts ? "並" : "and.ogg"; + dictionary["take"] = tts ? "喺" : "take.ogg"; dictionary["exit"] = tts ? "出口離開" : "exit.ogg"; - + dictionary["1st"] = tts ? "第一個" : "1st.ogg"; dictionary["2nd"] = tts ? "第二個" : "2nd.ogg"; dictionary["3rd"] = tts ? "第三個" : "3rd.ogg"; @@ -90,14 +91,14 @@ function populateDictionary(tts) { dictionary["reached_poi"] = tts ? "你已抵達興趣點" : "reached_poi.ogg"; // ATTENTION - dictionary["exceed_limit"] = tts ? "已超速" : "exceed_limit.ogg"; + dictionary["exceed_limit"] = tts ? "車速限制" : "exceed_limit.ogg"; dictionary["attention"] = tts ? "注意" : "attention.ogg"; dictionary["speed_camera"] = tts ? "快相機" : "speed_camera.ogg"; dictionary["border_control"] = tts ? "邊境管制" : "border_control.ogg"; dictionary["railroad_crossing"] = tts ? "鐵路平交道" : "railroad_crossing.ogg"; dictionary["traffic_calming"] = tts ? "減速壆" : "traffic_calming.ogg"; dictionary["toll_booth"] = tts ? "收費亭" : "toll_booth.ogg"; - dictionary["stop"] = tts ? "停止標誌" : "stop.ogg"; + dictionary["stop"] = tts ? "停車標誌" : "stop.ogg"; dictionary["pedestrian_crosswalk"] = tts ? "行人過路處" : "pedestrian_crosswalk.ogg"; dictionary["tunnel"] = tts ? "隧道" : "tunnel.ogg"; @@ -111,7 +112,9 @@ function populateDictionary(tts) { dictionary["onto"] = tts ? "落喺" : "onto.ogg"; dictionary["on"] = tts ? "喺" : "on.ogg"; dictionary["to"] = tts ? "去" : "to.ogg"; - dictionary["toward"] = tts ? "向" : "toward.ogg"; + dictionary["toward"] = tts ? "往" : "toward.ogg"; + dictionary["enter"] = tts ? "入" : "enter.ogg"; + // DISTANCE UNIT SUPPORT dictionary["meters"] = tts ? "公尺" : "meters.ogg"; @@ -129,7 +132,7 @@ function populateDictionary(tts) { dictionary["time"] = tts ? "所需時間" : "time.ogg"; dictionary["1_hour"] = tts ? "一小時" : "1_hour.ogg"; dictionary["hours"] = tts ? "小時" : "hours.ogg"; - dictionary["less_a_minute"] = tts ? "不到一分鐘" : "less_a_minute.ogg"; + dictionary["less_a_minute"] = tts ? "少於一分鐘" : "less_a_minute.ogg"; dictionary["1_minute"] = tts ? "一分鐘" : "1_minute.ogg"; dictionary["minutes"] = tts ? "分鐘" : "minutes.ogg"; } @@ -247,14 +250,14 @@ function hours(minutes) { } function route_recalc(dist, seconds) { - return dictionary["route_calculate"] + " " + dictionary["distance"] + " " + distance(dist) + " " + dictionary["time"] + " " + time(seconds) + (tts ? ". " : " "); + return dictionary["route_calculate"] + " " + dictionary["route_is1"] + " " + distance(dist) + " " + dictionary["route_is2"] + " " + dictionary["time"] + " " + time(seconds) + (tts ? ". " : " "); } function go_ahead(dist, streetName) { if (dist == -1) { return dictionary["go_ahead"]; } else { - return dictionary["follow"] + " " + distance(dist) + " " + follow_street(streetName); + return follow_street(streetName) + " " + dictionary["follow"] + " " + distance(dist); } } @@ -275,16 +278,16 @@ function turn(turnType, dist, streetName) { if (dist == -1) { return getTurnType(turnType) + " " + turn_street(streetName); } else { - return dictionary["in"] + " " + distance(dist) + " " + getTurnType(turnType) + " " + turn_street(streetName); + return dictionary["in"] + " " + distance(dist) + " " + dictionary["after"] + " " +getTurnType(turnType) + " " + turn_street(streetName); } } function take_exit(turnType, dist, exitString, exitInt, streetName) { if (dist == -1) { - return getTurnType(turnType) + " " + dictionary["onto"] + " " + getExitNumber(exitString, exitInt) + " " + take_exit_name(streetName); + return getTurnType(turnType) + " " + getExitNumber(exitString, exitInt) + " " + take_exit_name(streetName) + " " + dictionary["exit"]; } else { return dictionary["in"] + " " + distance(dist) + " " - + getTurnType(turnType) + " " + dictionary["onto"] + " " + getExitNumber(exitString, exitInt) + " " + take_exit_name(streetName); + + dictionary["after"] + " " + getTurnType(turnType) + " " + getExitNumber(exitString, exitInt) + " " + take_exit_name(streetName) + " " + dictionary["exit"]; } } @@ -339,16 +342,17 @@ function getTurnType(turnType) { } } +/* function then() { return (tts ? ", " : " ") + dictionary["then"] + " "; -} +}*/ function roundabout(dist, angle, exit, streetName) { - if (dist == -1) { + if (dist == -1 && streetName) { return dictionary["take"] + " " + nth(exit) + " " + dictionary["exit"] + " " + turn_street(streetName); } else { - return dictionary["in"] + " " + distance(dist) + " " + dictionary["roundabout"] + " " + dictionary["and"] + " " + dictionary["take"] + " " + nth(exit) + " " + dictionary["exit"] + " " + turn_street(streetName); - } + return dictionary["in"] + " " + distance(dist) + " " + dictionary["after"] + " " + dictionary["roundabout"] + " " + dictionary["and"] + " " + dictionary["take"] + " " + nth(exit) + " " + turn_street(streetName) ) + " " + dictionary["exit"] ; + } } @@ -419,9 +423,9 @@ function nth(exit) { function make_ut(dist, streetName) { if (dist == -1) { - return dictionary["make_uturn2"] + " " + turn_street(streetName); + return dictionary["make_uturn2"] + " " + dictionary["enter"] + " " + turn_street(streetName); } else { - return dictionary["in"] + " " + distance(dist) + " " + dictionary["make_uturn1"] + " " + turn_street(streetName); + return dictionary["in"] + " " + distance(dist) + " " + dictionary["after"] + " " + dictionary["make_uturn1"] + " " + dictionary["enter"] + " " + turn_street(streetName); } } @@ -434,15 +438,15 @@ function bear_right(streetName) { } function prepare_make_ut(dist, streetName) { - return dictionary["after"] + " " + distance(dist) + " " + dictionary["make_uturn"] + " " + turn_street(streetName); + return distance(dist) + " " + dictionary["after"] + " " + dictionary["make_uturn"] + " " + turn_street(streetName); } function prepare_turn(turnType, dist, streetName) { - return dictionary["after"] + " " + distance(dist) + " " + getTurnType(turnType) + " " + turn_street(streetName); + return distance(dist) + " " + dictionary["after"] + " " + getTurnType(turnType) + " " + turn_street(streetName); } function prepare_roundabout(dist, exit, streetName) { - return dictionary["after"] + " " + distance(dist) + " " + dictionary["prepare_roundabout"]; + return distance(dist) + " " + dictionary["after"] + " " + dictionary["prepare_roundabout"]; } function and_arrive_destination(dest) {