Skip to content

Commit

Permalink
update update salvo version
Browse files Browse the repository at this point in the history
  • Loading branch information
fankaiLiu committed Jan 11, 2024
1 parent 15f05c7 commit d831dba
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "salvo-cli"
version = "0.1.40"
version = "0.1.41"
edition = "2021"
authors = ["Fankai Liu liufankai137@outlook.com","mrxiaozhuox mrxzx.info@gmail.com"]
keywords = ["salvo", "cli","template"]
Expand Down
18 changes: 18 additions & 0 deletions locales/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -879,3 +879,21 @@ mongodb_usage_import_user_data:
th: 🎯 โปรดเรียกใช้โปรแกรมก่อน, จากนั้นนำเข้าข้อมูลจาก data/user.json ไปยังตารางผู้ใช้
el: 🎯 Παρακαλώ πρώτα τρέξτε το πρόγραμμα, στη συνέχεια εισάγετε τα δεδομένα από το data/user.json στον πίνακα χρήστη
da: 🎯 Kør venligst først programmet, importér derefter data fra data/user.json ind i brugertabellen
rust_version_tip:
en: "😄 The latest version of Salvo requires Rust version 1.75. If your compilation fails, please try upgrading with `rustup update`."
zh_CN: "😄 最新版的 Salvo 依赖 Rust 版本 1.75。如果编译失败,请尝试使用 `rustup update` 来升级版本。"
zh_TW: "😄 最新版的 Salvo 需要 Rust 版本 1.75。如果您的編譯失敗,請嘗試使用 `rustup update` 來升級版本。"
fr: "😄 La dernière version de Salvo nécessite la version 1.75 de Rust. Si votre compilation échoue, veuillez essayer de mettre à niveau avec `rustup update`."
ja: "😄 最新のSalvoにはRustのバージョン1.75が必要です。コンパイルに失敗した場合は、`rustup update`でアップグレードしてみてください。"
es: "😄 La última versión de Salvo requiere la versión 1.75 de Rust. Si la compilación falla, intenta actualizar con `rustup update`."
de: "😄 Die neueste Version von Salvo erfordert die Rust-Version 1.75. Wenn die Kompilierung fehlschlägt, versuchen Sie bitte, mit `rustup update` zu aktualisieren."
ru: "😄 Последняя версия Salvo требует версии Rust 1.75. Если компиляция не удаётся, пожалуйста, попробуйте обновиться с помощью `rustup update`."
it: "😄 L'ultima versione di Salvo richiede la versione 1.75 di Rust. Se la compilazione fallisce, prova ad aggiornare con `rustup update`."
pt: "😄 A versão mais recente do Salvo requer a versão 1.75 do Rust. Se a compilação falhar, tente atualizar com `rustup update`."
ko: "😄 최신 Salvo 버전은 Rust 1.75 버전을 필요로 합니다. 컴파일에 실패한다면, `rustup update`로 업그레이드를 시도해보세요."
no: "😄 Den nyeste versjonen av Salvo krever Rust versjon 1.75. Hvis kompileringen feiler, vennligst prøv å oppgradere med `rustup update`."
is: "😄 Nýjasta útgáfa af Salvo krefst Rust útgáfu 1.75. Ef þýðing mistekst, reyndu þá að uppfæra með `rustup update`."
uk: "😄 Остання версія Salvo потребує версію Rust 1.75. Якщо компіляція не вдається, будь ласка, спробуйте оновити за допомогою `rustup update`."
th: "😄 เวอร์ชันล่าสุดของ Salvo ต้องการ Rust เวอร์ชัน 1.75 หากการคอมไพล์ล้มเหลว กรุณาลองอัพเดทด้วย `rustup update`"
el: "😄 Η τελευταία έκδοση του Salvo απαιτεί την έκδοση 1.75 της Rust. Εάν η συνταξιοποίηση αποτύχει, δοκιμάστε να αναβαθμίσετε με `rustup update`."
da: "😄 Den nyeste version af Salvo kræver Rust version 1.75. Hvis din kompilering fejler, prøv da at opgradere med `rustup update`."
1 change: 1 addition & 0 deletions src/template/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# {{introduction}}
{{introduction_text}}
{{{rust_version_tip}}}
{{#if is_sqlite}}
{{/if}}
``` shell
Expand Down
2 changes: 2 additions & 0 deletions src/template/src/routers/user.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use salvo::{
writing::{Redirect, Text},
Request, Response,
};
use salvo::Writer;

#[derive(Template)]
#[template(path = "login.html")]
Expand Down Expand Up @@ -119,6 +120,7 @@ use salvo::{
oapi::extract::{JsonBody, PathParam},
Request, Response,
};
use salvo::Writer;

#[endpoint( tags("comm"),)]
pub async fn post_login(req: JsonBody<UserLoginRequest>, res: &mut Response) {
Expand Down
6 changes: 3 additions & 3 deletions src/utils/create_project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ pub fn create_project(project: Project) -> Result<()> {

fn after_print_info(project_name: &String) {
println!(); // a new line
// print success info
success(t!("create_info", project_name = project_name).replace(r"\n", "\n"));
success(t!("create_success").replace(r"\n", "\n"));
success(t!("rust_version_tip").replace(r"`", "`"));
println!(); // a new line
}

Expand Down Expand Up @@ -83,7 +83,7 @@ pub fn write_project_file(
"jsonwebtoken": "8.3.0",
"once_cell": "1.18.0",
"salvo": {
"version": "0.63",
"version": "0.64",
"features": ["anyhow", "logging", "cors", "oapi", "jwt-auth", "rustls", "catch-panic","cookie","serve-static","test"]
},
"serde": "1.0.188",
Expand Down Expand Up @@ -142,7 +142,7 @@ pub fn write_project_file(
data["database_connection_failed"] =
handlebars::JsonValue::String(t!("database_connection_failed"));
data["user_does_not_exist"] = handlebars::JsonValue::String(t!("user_does_not_exist"));

data["rust_version_tip"] = handlebars::JsonValue::String(t!("rust_version_tip"));
let mut dependencies = data["dependencies"].clone();
handle_dependencies(
&mut dependencies,
Expand Down

0 comments on commit d831dba

Please sign in to comment.