Skip to content

Commit 7f04d57

Browse files
binh-dam-ibigroupbinh-dam-ibigroup
committed
Merge branch 'dev' into build-with-vite
2 parents 901901b + 5000cda commit 7f04d57

File tree

10 files changed

+133
-34
lines changed

10 files changed

+133
-34
lines changed

‎i18n/es.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ actions:
5858
itineraryExistenceCheckFailed: Comprobación de errores para ver si el viaje seleccionado es posible.
5959
mustAcceptTermsToSavePlace: Acepte los Términos de uso (en Mi Cuenta) para guardar las ubicaciones.
6060
mustBeLoggedInToSavePlace: Por favor, inicia la sesión para guardar las ubicaciones.
61+
placeDeleted: Se ha eliminado su ubicación.
6162
placeRemembered: La configuración de este lugar se ha guardado.
6263
preferencesSaved: Sus preferencias se han guardado.
6364
smsInvalidCode: El código introducido no es válido. Por favor, inténtelo de nuevo.
@@ -105,6 +106,7 @@ common:
105106
edit: Editar
106107
error: ¡error!
107108
finish: Finalizar
109+
loading: Cargando
108110
next: Siguiente
109111
"no": "No"
110112
print: Imprimir
@@ -275,6 +277,9 @@ components:
275277
setAddressForPlaceType: Establezca su dirección de {placeType}
276278
FavoritePlaceScreen:
277279
addNewPlace: Agregar un nuevo lugar
280+
charactersRemaining: >-
281+
{chars, plural, one {# caracter que quedan} other {# caracteres que
282+
quedan}}
278283
editPlace: Editar {placeName}
279284
editPlaceGeneric: Editar lugar
280285
invalidAddress: Por favor, establezca una ubicación para este lugar.

‎i18n/ko.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ actions:
4949
itineraryExistenceCheckFailed: 선택한 트립이 가능한지 확인하는 중에 오류가 발생했습니다.
5050
mustAcceptTermsToSavePlace: 위치를 저장하려면 사용 약관(내 계정 아래)을 수락하십시오.
5151
mustBeLoggedInToSavePlace: 위치를 저장하려면 로그인하십시오.
52+
placeDeleted: 내 장소가 삭제되었습니다.
5253
placeRemembered: 이 장소에 대한 설정이 저장되었습니다.
5354
preferencesSaved: 선호사항이 저장되었습니다.
5455
smsInvalidCode: 입력한 코드가 유효하지 않습니다. 다시 시도하세요.
@@ -92,6 +93,7 @@ common:
9293
edit: 수정
9394
error: 오류!
9495
finish: 마침
96+
loading: 로딩
9597
next: 다음
9698
"no": 아니요
9799
print: 인쇄
@@ -252,6 +254,7 @@ components:
252254
setAddressForPlaceType: "{placeType}의 주소 설정"
253255
FavoritePlaceScreen:
254256
addNewPlace: 새 장소 추가
257+
charactersRemaining: "{chars, plural, one {# 남은 문자 수} other {# 남은 글자수}}"
255258
editPlace: "{placeName} 수정"
256259
editPlaceGeneric: 장소 수정
257260
invalidAddress: 이 장소의 위치를 설정하세요.

‎i18n/ru.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ actions:
5757
Примите «Условия использования» (в разделе «Моя учетная запись»), чтобы
5858
сохранять местоположения.
5959
mustBeLoggedInToSavePlace: Пожалуйста, войдите в систему, чтобы сохранять местоположения.
60+
placeDeleted: Ваша позиция удалена.
6061
placeRemembered: Настройки этого места сохранены.
6162
preferencesSaved: Ваши параметры сохранены.
6263
smsInvalidCode: Введен недействительный код. Попробуйте еще раз.
@@ -104,6 +105,7 @@ common:
104105
edit: Редактировать
105106
error: Ошибка!
106107
finish: Завершить
108+
loading: Загрузка
107109
next: Далее
108110
"no": Нет
109111
print: Печать
@@ -276,6 +278,7 @@ components:
276278
setAddressForPlaceType: Укажите адрес места «{placeType}»
277279
FavoritePlaceScreen:
278280
addNewPlace: Добавить новое место
281+
charactersRemaining: "{chars, plural, one {# символ слева} other {# символов осталось}}"
279282
editPlace: Редактировать место «{placeName}»
280283
editPlaceGeneric: Редактировать место
281284
invalidAddress: Выберите местоположение для этого места.

‎i18n/ta.yml

Lines changed: 40 additions & 25 deletions
Large diffs are not rendered by default.

‎i18n/tl.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ actions:
6363
Pakitanggap ang Mga Tuntunin ng Paggamit (sa ilalim ng Aking Account) para
6464
mag-save ng mga lokasyon.
6565
mustBeLoggedInToSavePlace: Mangyaring mag-log in para mag-save ng mga lokasyon.
66+
placeDeleted: Na-delete na ang iyong lugar.
6667
placeRemembered: Na-save na ang mga setting para sa lugar na ito.
6768
preferencesSaved: Na-save ang iyong mga kagustuhan.
6869
smsInvalidCode: Invalid ang inilagay mong code. Subukan ulit.
@@ -111,6 +112,7 @@ common:
111112
edit: I-edit
112113
error: nagka-error!
113114
finish: Tapos na
115+
loading: Loading
114116
next: Susunod
115117
"no": Hindi
116118
print: I-print
@@ -284,6 +286,9 @@ components:
284286
setAddressForPlaceType: Itakda ang address ng iyong {placeType}
285287
FavoritePlaceScreen:
286288
addNewPlace: Magdagdag ng bagong lugar
289+
charactersRemaining: >-
290+
{chars, plural, one {# natitirang karakter} other {# natitirang
291+
character}}
287292
editPlace: I-edit ang {placeName}
288293
editPlaceGeneric: I-edit ang lugar
289294
invalidAddress: Magtakda ng lokasyon para sa lugar na ito.

‎i18n/vi.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ actions:
5858
Vui lòng chấp nhận Điều Khoản Sử Dụng (trong phần Tài Khoản Của Tôi) để
5959
lưu lại địa điểm.
6060
mustBeLoggedInToSavePlace: Vui lòng đăng nhập để lưu lại địa điểm.
61+
placeDeleted: Địa điểm của bạn đã bị xóa.
6162
placeRemembered: Cài đặt cho vị trí này đã được lưu lại.
6263
preferencesSaved: Những sở thích của bạn đã được lưu lại.
6364
smsInvalidCode: Mã bạn nhập không hợp lệ. Vui lòng thử lại.
@@ -105,6 +106,7 @@ common:
105106
edit: Chỉnh sửa
106107
error: lỗi!
107108
finish: Kết thúc
109+
loading: Đang tải
108110
next: Tiếp theo
109111
"no": Không
110112
print: In
@@ -271,6 +273,7 @@ components:
271273
setAddressForPlaceType: Cài đặt địa chỉ {placeType} của bạn
272274
FavoritePlaceScreen:
273275
addNewPlace: Thêm địa điểm mới
276+
charactersRemaining: "{chars, plural, one {# ký tự còn lại} other {# số ký tự còn lại}}"
274277
editPlace: Chỉnh sửa {placeName}
275278
editPlaceGeneric: Chỉnh sửa vị trí
276279
invalidAddress: Vui lòng cài đặt một vị trí cho nơi này.

‎i18n/zh_Hans.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ actions:
4949
itineraryExistenceCheckFailed: 检查你选择的旅行是否可行时出现错误.
5050
mustAcceptTermsToSavePlace: 请接受使用条款（在“我的帐户”下）以保存位置。
5151
mustBeLoggedInToSavePlace: 请登录以保存位置。
52+
placeDeleted: 您的位置已被删除。
5253
placeRemembered: 针对此地点的设置已保存。
5354
preferencesSaved: 您的偏好已被保存.
5455
smsInvalidCode: 您输入的代码无效. 请再试一次.
@@ -92,6 +93,7 @@ common:
9293
edit: 编辑
9394
error: 错误!
9495
finish: 完成
96+
loading: 正在加载
9597
next: 下一页
9698
"no": 否
9799
print: 打印
@@ -249,6 +251,7 @@ components:
249251
setAddressForPlaceType: 设置您的 {placeType} 地址
250252
FavoritePlaceScreen:
251253
addNewPlace: 添加新地点
254+
charactersRemaining: "{chars, plural, one {# 剩余字符} other {# 剩餘字元}}"
252255
editPlace: 编辑 {placeName}
253256
editPlaceGeneric: 编辑地点
254257
invalidAddress: 请为这个地点设定一个位置.

‎i18n/zh_Hant.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ actions:
4848
itineraryExistenceCheckFailed: 檢查您選取的行程是否可行時發生錯誤。
4949
mustAcceptTermsToSavePlace: 請接受使用條款 (在我的帳戶下)，以儲存地點。
5050
mustBeLoggedInToSavePlace: 請登入，以儲存地點。
51+
placeDeleted: 您的地點已被刪除。
5152
placeRemembered: 此地點的設定已儲存。
5253
preferencesSaved: 您的偏好已儲存。
5354
smsInvalidCode: 您輸入的代碼無效。請再試一次。
@@ -91,6 +92,7 @@ common:
9192
edit: 編輯
9293
error: 錯誤！
9394
finish: 完成
95+
loading: 載入中
9496
next: 前進
9597
"no": 否
9698
print: 列印
@@ -232,6 +234,7 @@ components:
232234
setAddressForPlaceType: 設定您的{placeType}地址
233235
FavoritePlaceScreen:
234236
addNewPlace: 新增地點
237+
charactersRemaining: "{chars, plural, one {# 剩餘字元} other {# 剩餘字元}}"
235238
editPlace: 編輯{placeName}
236239
editPlaceGeneric: 編輯地點
237240
invalidAddress: 請為此地點設定位置。

‎lib/components/user/monitored-trip/trip-status.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
152152
}
153153
}
154154

155-
export default connect(
156-
mapStateToProps,
157-
mapDispatchToProps
158-
)(injectIntl(TripStatus))
155+
export default injectIntl(
156+
connect(mapStateToProps, mapDispatchToProps)(TripStatus)
157+
)

‎yarn.lock

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6905,7 +6905,7 @@ create-ecdh@^4.0.0, create-ecdh@^4.0.4:
69056905
bn.js "^4.1.0"
69066906
elliptic "^6.5.3"
69076907

6908-
create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
6908+
create-hash@^1.1.0, create-hash@^1.2.0:
69096909
version "1.2.0"
69106910
resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
69116911
integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -6916,7 +6916,17 @@ create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
69166916
ripemd160 "^2.0.1"
69176917
sha.js "^2.4.0"
69186918

6919-
create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
6919+
create-hash@~1.1.3:
6920+
version "1.1.3"
6921+
resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
6922+
integrity sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==
6923+
dependencies:
6924+
cipher-base "^1.0.1"
6925+
inherits "^2.0.1"
6926+
ripemd160 "^2.0.0"
6927+
sha.js "^2.4.0"
6928+
6929+
create-hmac@^1.1.0, create-hmac@^1.1.7:
69206930
version "1.1.7"
69216931
resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
69226932
integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -9957,6 +9967,13 @@ has@^1.0.0, has@^1.0.1, has@^1.0.3:
99579967
resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
99589968
integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
99599969

9970+
hash-base@^2.0.0:
9971+
version "2.0.2"
9972+
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
9973+
integrity sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==
9974+
dependencies:
9975+
inherits "^2.0.1"
9976+
99609977
hash-base@^3.0.0:
99619978
version "3.1.0"
99629979
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
@@ -10977,7 +10994,7 @@ is-text-path@^1.0.1:
1097710994
dependencies:
1097810995
text-extensions "^1.0.0"
1097910996

10980-
is-typed-array@^1.1.3:
10997+
is-typed-array@^1.1.14, is-typed-array@^1.1.3:
1098110998
version "1.1.15"
1098210999
resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
1098311000
integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
@@ -11026,6 +11043,11 @@ [email protected], isarray@^1.0.0, isarray@~1.0.0:
1102611043
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
1102711044
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
1102811045

11046+
isarray@^2.0.5:
11047+
version "2.0.5"
11048+
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
11049+
integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
11050+
1102911051
[email protected], iserror@^0.0.2:
1103011052
version "0.0.2"
1103111053
resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5"
@@ -14528,7 +14550,19 @@ pbf@^3.2.1:
1452814550
ieee754 "^1.1.12"
1452914551
resolve-protobuf-schema "^2.1.0"
1453014552

14531-
pbkdf2@^3.0.3, pbkdf2@^3.1.2:
14553+
pbkdf2@^3.0.3:
14554+
version "3.1.3"
14555+
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.3.tgz#8be674d591d65658113424592a95d1517318dd4b"
14556+
integrity sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==
14557+
dependencies:
14558+
create-hash "~1.1.3"
14559+
create-hmac "^1.1.7"
14560+
ripemd160 "=2.0.1"
14561+
safe-buffer "^5.2.1"
14562+
sha.js "^2.4.11"
14563+
to-buffer "^1.2.0"
14564+
14565+
pbkdf2@^3.1.2:
1453214566
version "3.1.2"
1453314567
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
1453414568
integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
@@ -16845,6 +16879,14 @@ rimraf@^2.5.4, rimraf@^2.6.3:
1684516879
dependencies:
1684616880
glob "^7.1.3"
1684716881

16882+
ripemd160@=2.0.1:
16883+
version "2.0.1"
16884+
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
16885+
integrity sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==
16886+
dependencies:
16887+
hash-base "^2.0.0"
16888+
inherits "^2.0.1"
16889+
1684816890
ripemd160@^2.0.0, ripemd160@^2.0.1:
1684916891
version "2.0.2"
1685016892
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -17333,7 +17375,7 @@ [email protected]:
1733317375
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
1733417376
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
1733517377

17336-
sha.js@^2.4.0, sha.js@^2.4.8:
17378+
sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
1733717379
version "2.4.11"
1733817380
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
1733917381
integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -18508,6 +18550,15 @@ to-arraybuffer@^1.0.0:
1850818550
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
1850918551
integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
1851018552

18553+
to-buffer@^1.2.0:
18554+
version "1.2.1"
18555+
resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
18556+
integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
18557+
dependencies:
18558+
isarray "^2.0.5"
18559+
safe-buffer "^5.2.1"
18560+
typed-array-buffer "^1.0.3"
18561+
1851118562
to-fast-properties@^2.0.0:
1851218563
version "2.0.0"
1851318564
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -18834,6 +18885,15 @@ type@^2.5.0, type@^2.7.2:
1883418885
resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
1883518886
integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
1883618887

18888+
typed-array-buffer@^1.0.3:
18889+
version "1.0.3"
18890+
resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
18891+
integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
18892+
dependencies:
18893+
call-bound "^1.0.3"
18894+
es-errors "^1.3.0"
18895+
is-typed-array "^1.1.14"
18896+
1883718897
typedarray-to-buffer@^3.1.5:
1883818898
version "3.1.5"
1883918899
resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"

0 commit comments

Comments
 (0)