From 87ae660c644810f28796d351bd0586e983791b11 Mon Sep 17 00:00:00 2001 From: wingkwong Date: Fri, 4 Jun 2021 21:38:37 +0800 Subject: [PATCH 1/4] chore: sync version with package.json --- packages/nc-cli/package-lock.json | 2 +- packages/nocodb/package-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-cli/package-lock.json b/packages/nc-cli/package-lock.json index 186bf3b0eb..c7fe5e3ff2 100644 --- a/packages/nc-cli/package-lock.json +++ b/packages/nc-cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "create-nocodb-app", - "version": "0.1.17", + "version": "0.1.21", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 8204e13d6a..4ab0b4988c 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.9.22", + "version": "0.9.23", "lockfileVersion": 1, "requires": true, "dependencies": { From ed5781ae9a9d75a14dc23e7b125c1e8028ed06ff Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 7 Jun 2021 22:06:55 +0800 Subject: [PATCH 2/4] feat: i18n on project page - ref to #236 Signed-off-by: Wing-Kam Wong --- packages/nc-gui/pages/projects/index.vue | 79 +++++++++++++----------- packages/nc-gui/static/lang/en.json | 26 +++++++- packages/nc-gui/static/lang/ja.json | 26 +++++++- packages/nc-gui/static/lang/zh.json | 29 ++++++++- 4 files changed, 120 insertions(+), 40 deletions(-) diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue index 510bd47082..cc8b0bb2d5 100644 --- a/packages/nc-gui/pages/projects/index.vue +++ b/packages/nc-gui/pages/projects/index.vue @@ -12,7 +12,7 @@ - My Projects + {{ $t('home.my_projects') }} @@ -22,7 +22,7 @@ small color="primary grey" @click="projectsLoad" - tooltip="Refresh projects"> + v-bind:tooltip="$t('home.reload_projects_tooltip')"> mdi-refresh   @@ -34,20 +34,20 @@ ref="search1" v-model="search" class="caption pt-0 mt-0" - placeholder="Search Project" + v-bind:placeholder="$t('home.search_project')" single-line hide-details v-ge="['home','project-search']" style="max-width:200px" - > + > - + @@ -74,7 +74,7 @@ v-ge="['home','project-new']" @click="onCreateProject()"> mdi-plus - {{ $t('create-new-project') }} + {{ $t('home.create_new_project_button.text') }} --> @@ -91,7 +91,7 @@ v-ge="['home','project-new']" v-on="on" > - {{ $t('create-new-project') }} + {{ $t('home.create_new_project_button.text') }} mdi-menu-down @@ -103,14 +103,14 @@ mdi-plus - Create + {{ $t('home.create_new_project_button.subtext_1') }} - Create a new project + {{ $t('home.create_new_project_button.subtext_1_tooltip') }} @@ -119,7 +119,7 @@ mdi-power-plug-outline Create By Connecting
To An External Database
+ class="caption font-weight-regular" v-html="$t('home.create_new_project_button.subtext_2')">
@@ -127,7 +127,7 @@ - Supports MySQL, PostgreSQL, SQL Server & SQLite + {{ $t('home.create_new_project_button.subtext_2_tooltip') }} @@ -141,7 +141,7 @@ color="primary" v-ge="['home','project-new']" > - {{ $t('create-new-project') }} + {{ $t('home.create_new_project_button.text') }} @@ -170,9 +170,9 @@ :color="props.item.status === 'started' ? 'green' : (props.item.status === 'stopped' ? 'orange' : 'orange') "> mdi-moon-full - + @@ -186,32 +186,32 @@
+ mdi-stop-circle-outline + mdi-play-circle-outline - - mdi-loading mdi-spin - + mdi-restart - + mdi-delete-circle-outline @@ -225,21 +225,21 @@ mdi-import - Import Metadata + {{ $t('home.project_verticial_option_1') }} mdi-export - Export Metadata + {{ $t('home.project_verticial_option_2') }} mdi-delete-variant - Clear Metadata + {{ $t('home.project_verticial_option_3') }} @@ -255,7 +255,7 @@ :value="true" color="error" icon="warning" - >Your search for "{{ search }}" found no results. + >{{ $t('home.search.no_result', { search }) }} @@ -264,7 +264,8 @@ - Get started by creating a new project. + + {{ $t('home.project_empty_message') }} @@ -281,8 +282,8 @@

- - Create new project
by connecting to your
existing or new database
+ +

mdi-lightbulb-on   - New Project + + {{ $t('home.create_new_project_button.text') }} @@ -330,9 +332,11 @@ mdi-github - Star + + {{ $t('home.show_community_message_1_1') }} mdi-star-outline - us on Github + + {{ $t('home.show_community_message_1_2') }} @@ -340,21 +344,24 @@ mdi-calendar-month - Book a Free DEMO + + {{ $t('home.show_community_message_2') }} mdi-discord - Get your questions answered + + {{ $t('home.show_community_message_3') }} mdi-twitter - Follow NocoDB + + {{ $t('home.show_community_message_4') }} diff --git a/packages/nc-gui/static/lang/en.json b/packages/nc-gui/static/lang/en.json index cc6031b4e2..593d98e118 100644 --- a/packages/nc-gui/static/lang/en.json +++ b/packages/nc-gui/static/lang/en.json @@ -1,3 +1,27 @@ { - "create-new-project": "New Project" + "home.my_projects": "My Projects", + "home.reload_projects_tooltip": "Refresh projects", + "home.create_new_project_button.text": "New Project", + "home.create_new_project_button.subtext_1": "Create", + "home.create_new_project_button.subtext_1_tooltip": "Create a new project", + "home.create_new_project_button.subtext_2": "Create By Connecting
To An External Database", + "home.create_new_project_button.subtext_2_tooltip": "Supports MySQL, PostgreSQL, SQL Server & SQLite", + "home.search_project": "Search Project", + "home.project_verticial_option_1": "Import Metadata", + "home.project_verticial_option_2": "Export Metadata", + "home.project_verticial_option_3": "Clear Metadata", + "home.project_horizontal_option_1": "Stop Project", + "home.project_horizontal_option_2": "Start Project", + "home.project_horizontal_option_3": "Restart Project", + "home.project_horizontal_option_4": "Delete Project", + "home.project_api_type_tooltip_graphql": "Accessible via GraphQL APIs", + "home.project_api_type_tooltip_rest": "Accessible via REST APIs", + "home.project_empty_message": "Get started by creating a new project", + "home.import_button.text": "Import NocoDB Project by uploading metadata zip file", + "home.show_community_message_1_1": "Star", + "home.show_community_message_1_2": "us on Github", + "home.show_community_message_2": "Book a Free DEMO", + "home.show_community_message_3": "Get your questions answered", + "home.show_community_message_4": "Follow NocoDB", + "home.search.no_result": "Your search for {search} found no results" } diff --git a/packages/nc-gui/static/lang/ja.json b/packages/nc-gui/static/lang/ja.json index 4a50ec6db5..1be007c814 100644 --- a/packages/nc-gui/static/lang/ja.json +++ b/packages/nc-gui/static/lang/ja.json @@ -1,3 +1,27 @@ { - "create-new-project": "新しいプロジェクトを作成する" + "home.my_projects": "My Projects", + "home.reload_projects_tooltip": "Refresh projects", + "home.create_new_project_button.text": "新しいプロジェクトを作成する", + "home.create_new_project_button.subtext_1": "Create", + "home.create_new_project_button.subtext_1_tooltip": "Create a new project", + "home.create_new_project_button.subtext_2": "Create By Connecting
To An External Database", + "home.create_new_project_button.subtext_2_tooltip": "Supports MySQL, PostgreSQL, SQL Server & SQLite", + "home.search_project": "Search Project", + "home.project_verticial_option_1": "Import Metadata", + "home.project_verticial_option_2": "Export Metadata", + "home.project_verticial_option_3": "Clear Metadata", + "home.project_horizontal_option_1": "Stop Project", + "home.project_horizontal_option_2": "Start Project", + "home.project_horizontal_option_3": "Restart Project", + "home.project_horizontal_option_4": "Delete Project", + "home.project_api_type_tooltip_graphql": "Accessible via GraphQL APIs", + "home.project_api_type_tooltip_rest": "Accessible via REST APIs", + "home.project_empty_message": "Get started by creating a new project", + "home.import_button.text": "Import NocoDB Project by uploading metadata zip file", + "home.show_community_message_1_1": "Star", + "home.show_community_message_1_2": "us on Github", + "home.show_community_message_2": "Book a Free DEMO", + "home.show_community_message_3": "Get your questions answered", + "home.show_community_message_4": "Follow NocoDB", + "home.search.no_result": "Your search for {search} found no results" } diff --git a/packages/nc-gui/static/lang/zh.json b/packages/nc-gui/static/lang/zh.json index ff028a2dd9..2261901460 100644 --- a/packages/nc-gui/static/lang/zh.json +++ b/packages/nc-gui/static/lang/zh.json @@ -1,3 +1,28 @@ { - "create-new-project": "创建新项目" -} + "home.my_projects": "My Projects", + "home.reload_projects_tooltip": "Refresh projects", + "home.create_new_project_button.text": "创建新项目", + "home.create_new_project_button.subtext_1": "Create", + "home.create_new_project_button.subtext_1_tooltip": "Create a new project", + "home.create_new_project_button.subtext_2": "Create By Connecting
To An External Database", + "home.create_new_project_button.subtext_2_tooltip": "Supports MySQL, PostgreSQL, SQL Server & SQLite", + "home.search_project": "Search Project", + "home.project_verticial_option_1": "Import Metadata", + "home.project_verticial_option_2": "Export Metadata", + "home.project_verticial_option_3": "Clear Metadata", + "home.project_horizontal_option_1": "Stop Project", + "home.project_horizontal_option_2": "Start Project", + "home.project_horizontal_option_3": "Restart Project", + "home.project_horizontal_option_4": "Delete Project", + "home.project_api_type_tooltip_graphql": "Accessible via GraphQL APIs", + "home.project_api_type_tooltip_rest": "Accessible via REST APIs", + "home.project_empty_message": "Get started by creating a new project", + "home.import_button.text": "Import NocoDB Project by uploading metadata zip file", + "home.show_community_message_1_1": "Star", + "home.show_community_message_1_2": "us on Github", + "home.show_community_message_2": "Book a Free DEMO", + "home.show_community_message_3": "Get your questions answered", + "home.show_community_message_4": "Follow NocoDB", + "home.search.no_result": "Your search for {search} found no results" + } + \ No newline at end of file From 197b5a9516eb05e28719bf2b1305dad40d059dd4 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 7 Jun 2021 22:09:35 +0800 Subject: [PATCH 3/4] chore: remove unused local files Signed-off-by: Wing-Kam Wong --- packages/nc-gui/assets/img/lang/en.json | 3 --- packages/nc-gui/assets/img/lang/ja.json | 3 --- packages/nc-gui/assets/img/lang/zh.json | 3 --- 3 files changed, 9 deletions(-) delete mode 100644 packages/nc-gui/assets/img/lang/en.json delete mode 100644 packages/nc-gui/assets/img/lang/ja.json delete mode 100644 packages/nc-gui/assets/img/lang/zh.json diff --git a/packages/nc-gui/assets/img/lang/en.json b/packages/nc-gui/assets/img/lang/en.json deleted file mode 100644 index 8437b0c360..0000000000 --- a/packages/nc-gui/assets/img/lang/en.json +++ /dev/null @@ -1,3 +0,0 @@ - { - "create-new-project": "Create New Project" -} diff --git a/packages/nc-gui/assets/img/lang/ja.json b/packages/nc-gui/assets/img/lang/ja.json deleted file mode 100644 index 4a50ec6db5..0000000000 --- a/packages/nc-gui/assets/img/lang/ja.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "create-new-project": "新しいプロジェクトを作成する" -} diff --git a/packages/nc-gui/assets/img/lang/zh.json b/packages/nc-gui/assets/img/lang/zh.json deleted file mode 100644 index ff028a2dd9..0000000000 --- a/packages/nc-gui/assets/img/lang/zh.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "create-new-project": "创建新项目" -} From ddb321d7adc8736cba257faa8e4b63723735bd8f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 7 Jun 2021 22:28:03 +0800 Subject: [PATCH 4/4] chore: format index.vue Signed-off-by: Wing-Kam Wong --- packages/nc-gui/pages/projects/index.vue | 1237 +++++++++++++--------- 1 file changed, 728 insertions(+), 509 deletions(-) diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue index cc8b0bb2d5..a6018317a8 100644 --- a/packages/nc-gui/pages/projects/index.vue +++ b/packages/nc-gui/pages/projects/index.vue @@ -1,34 +1,48 @@