Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/extract-event…
Browse files Browse the repository at this point in the history
…-backend
  • Loading branch information
raae7742 committed Jun 4, 2022
2 parents b7422f7 + cefe33f commit 4db826e
Show file tree
Hide file tree
Showing 14 changed files with 554 additions and 380 deletions.
2 changes: 1 addition & 1 deletion react-native/components/BottomDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function BottomDrawer(props: BottomDrawerProps) {

useEffect(() => {
if (props.openSaveForm && firstCid) {
setResultsForm({ cid: firstCid, title: 'title' });
setResultsForm({ cid: firstCid, title: props?.results?.title ? props.results.title : 'title' });
}
}, [props?.openSaveForm])

Expand Down
6 changes: 4 additions & 2 deletions react-native/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default {
hello_2: '!',
todayEvent: "Today's Events",
eventCount_1: "You've got ",
eventCount_2: "events today.",
eventCount_2: " events today.",
functions: 'Functions',
/* Join */
loginSuccess: 'Success',
Expand Down Expand Up @@ -74,5 +74,7 @@ export default {
searchResult: "Search Result",
noEvent: "There is no event today!",
saveFirst: "Click the Save button to save the results first!",
eventNotFound: "No event found"
eventNotFound: "No event found",
noResults: "There are no results yet",
translateFirst: "Translate and save the results."
}
4 changes: 3 additions & 1 deletion react-native/locales/ja.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,7 @@ export default {
searchResult: "検索結果",
noEvent: "今日はイベントはありません!",
saveFirst: "保存ボタンを押して結果を保存してください!",
eventNotFound: "イベントが見つかりませんでした"
eventNotFound: "イベントが見つかりませんでした",
noResults: "まだ結果はありません。",
translateFirst: "結果を翻訳して保存する。"
}
4 changes: 3 additions & 1 deletion react-native/locales/km.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,7 @@ export default {
searchResult: "លទ្ធផលស្វែងរក",
noEvent: "មិនមានព្រឹត្តិការណ៍ថ្ងៃនេះទេ!",
saveFirst: "ចុចប៊ូតុង Save ដើម្បីរក្សាទុកលទ្ធផលជាមុន!",
eventNotFound: "រកមិនឃើញព្រឹត្តិការណ៍ទេ។"
eventNotFound: "រកមិនឃើញព្រឹត្តិការណ៍ទេ។",
noResults: "មិនទាន់មានលទ្ធផលនៅឡើយទេ។",
translateFirst: "បកប្រែ និងរក្សាទុកលទ្ធផល។"
}
4 changes: 3 additions & 1 deletion react-native/locales/ko.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,7 @@ export default {
searchResult: "검색 결과",
noEvent: "오늘은 이벤트가 없어요!",
saveFirst: "저장 버튼을 눌러서 결과 저장을 먼저 해주세요!",
eventNotFound: "이벤트를 찾지 못했어요"
eventNotFound: "이벤트를 찾지 못했어요",
noResults: "아직 결과가 없습니다.",
translateFirst: "번역을 한 후에 결과를 저장해주세요."
}
4 changes: 3 additions & 1 deletion react-native/locales/th.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,7 @@ export default {
searchResult: "ผลการค้นหา",
noEvent: "วันนี้ไม่มีกิจกรรม!",
saveFirst: "คลิกปุ่มบันทึกเพื่อบันทึกผลลัพธ์ก่อน!",
eventNotFound: "ไม่พบกิจกรรม"
eventNotFound: "ไม่พบกิจกรรม",
noResults: "ยังไม่มีผลลัพธ",
translateFirst: "แปลและบันทึกผลลัพธ์"
}
4 changes: 3 additions & 1 deletion react-native/locales/vn.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,7 @@ export default {
searchResult: "Kết quả tìm kiếm",
noEvent: "Không có sự kiện hôm nay!",
saveFirst: "Nhấp vào nút Lưu để lưu kết quả trước!",
eventNotFound: "Không tìm thấy sự kiện nào"
eventNotFound: "Không tìm thấy sự kiện nào",
noResults: "Chưa có kết quả.",
translateFirst: "Dịch và lưu kết quả."
}
4 changes: 3 additions & 1 deletion react-native/locales/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,7 @@ export default {
searchResult: "搜索结果",
noEvent: "今天没有活动!",
saveFirst: "单击保存按钮首先保存结果!",
eventNotFound: "未找到任何事件"
eventNotFound: "未找到任何事件",
noResults: "目前还没有结果。",
translateFirst: "翻译并保存结果。"
}
Loading

0 comments on commit 4db826e

Please sign in to comment.