Merge branch 'liquid' of https://github.com/salvo-rs/salvo-cli into l…

…iquid
salvo-rs · Jan 19, 2025 · b893a01 · b893a01
2 parents 9fbe2b7 + 201f3c9
commit b893a01
Show file tree

Hide file tree

Showing 25 changed files with 490 additions and 495 deletions.
diff --git a/locales/code_comment.yml b/locales/code_comment.yml
@@ -256,24 +256,6 @@ username:
   th: ชื่อผู้ใช้
   el: Όνομα χρήστη
   da: Brugernavn
-generate_a_string_of_a_specified_length:
-  en: Generate a string of a specified length
-  zh_CN: 生成指定长度的字符串
-  zh_TW: 生成指定長度的字串
-  fr: Générer une chaîne de caractères d'une longueur spécifiée
-  ja: 指定した長さの文字列を生成する
-  es: Generar una cadena de una longitud especificada
-  de: Erzeugen Sie eine Zeichenkette einer bestimmten Länge
-  ru: Генерировать строку заданной длины
-  it: Generare una stringa di una lunghezza specificata
-  pt: Gerar uma string de um comprimento especificado
-  ko: 지정된 길이의 문자열 생성
-  no: Generer en streng av en spesifisert lengde
-  is: Búa til streng af tiltekinni lengd
-  uk: Генерувати рядок заданої довжини
-  th: สร้างสตริงความยาวที่ระบุ
-  el: Δημιουργήστε μια συμβολοσειρά ενός καθορισμένου μήκους
-  da: Generer en streng af en bestemt længde
 contact_support:
   en: Contact Support
   zh_CN: 联系支持
@@ -492,6 +474,25 @@ listen_on:
   th: ฟังที่
   el: ακούστε στο
   da: lyt på
+
+lang:
+  en: en
+  zh_CN: zh-cn
+  zh_TW: zh-tw
+  fr: fr
+  ja: ja
+  es: es
+  de: de
+  ru: ru
+  it: it
+  pt: pt
+  ko: ko
+  no: no
+  is: is
+  uk: uk
+  th: th
+  el: el
+  da: da
 salvo_cli_welcome:
   en: Salvo-Cli Generated, Please Read README.md
   zh_CN: 由Salvo-Cli生成，使用前请阅读README.md

diff --git a/src/templates/classic/mod.rs b/src/templates/classic/mod.rs
@@ -46,7 +46,6 @@ fn create_files(project_path: &Path, user_selected: Selected, new_cmd: &NewCmd)
         "config_error_read":t!("config_error_read"),
         "config_error_parse":t!("config_error_parse"),
         "config_error_read_failed":t!("config_error_read_failed"),
-        "generate_a_string_of_a_specified_length":t!("generate_a_string_of_a_specified_length"),
         "username":t!("username"),
         "password":t!("password"),
         "incorrect_password":t!("incorrect_password"),
@@ -66,7 +65,6 @@ fn create_files(project_path: &Path, user_selected: Selected, new_cmd: &NewCmd)
         "account":t!("account"),
         "password":t!("password"),
         "you_wont_be_able_to_revert_this":t!("you_wont_be_able_to_revert_this"),
-
 
         "salvo_cli_welcome":t!("salvo_cli_welcome"),
         "user_list":t!("user_list"),

diff --git a/template/_base/src/config/db.rs b/template/_base/src/config/db.rs
diff --git a/template/_base/src/config/mod.rs.liquid b/template/_base/src/config/mod.rs.liquid
diff --git a/template/_base/src/main.rs.liquid b/template/_base/src/main.rs.liquid
diff --git a/templates/classic/_base/config.toml.liquid b/templates/classic/_base/config.toml.liquid
@@ -1,7 +1,15 @@
 listen_addr = "127.0.0.1:8008"
 
 [db]
+{%- if db_type == "postgres" %}
 url = "postgres://postgres:[email protected]:5432/{{project_name}}"
+{%- endif %}
+{%- if db_type == "sqlite" %}
+url = "sqlite:data/{{db_lib}}.sqlite"
+{%- endif %}
+{%- if db_type == "mysql" %}
+url = "mysql://root:root@localhost/{{project_name}}"
+{%- endif %}
 pool_size = 1
 
 [jwt]