Merge branch 'topgrade-rs-main'

topgrade-rs · Oct 8, 2024 · 9aa4e50 · 9aa4e50
2 parents b586dd1 + f84d146
commit 9aa4e50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/locales/app.yml b/locales/app.yml
@@ -378,12 +378,12 @@ _version: 2
 "vim binary might be actually nvim":
   en: "vim binary might be actually nvim"
   zh_TW: "vim 執行檔可能為 nvim"
-"`{process}` failed: {exit_satus}":
-  en: "`%{process}` failed: %{exit_satus}"
-  zh_TW: "`%{process}` 失敗：%{exit_satus}"
-"`{process}` failed: {exit_satus} with {output}":
-  en: "`%{process}` failed: %{exit_satus} with %{output}"
-  zh_TW: "`%{process}` 失敗：%{exit_satus} 伴隨 %{output}"
+"`{process}` failed: {exit_status}":
+  en: "`%{process}` failed: %{exit_status}"
+  zh_TW: "`%{process}` 失敗：%{exit_status}"
+"`{process}` failed: {exit_status} with {output}":
+  en: "`%{process}` failed: %{exit_status} with %{output}"
+  zh_TW: "`%{process}` 失敗：%{exit_status} 伴隨 %{output}"
 "Unknown Linux Distribution":
   en: "Unknown Linux Distribution"
   zh_TW: "未知 Linux"

diff --git a/src/error.rs b/src/error.rs
@@ -27,7 +27,7 @@ impl Display for TopgradeError {
                     f,
                     "{}",
                     t!(
-                        "`{process}` failed: {exit_satus}",
+                        "`{process}` failed: {exit_status}",
                         process = process,
                         exit_status = exit_status
                     )
@@ -38,7 +38,7 @@ impl Display for TopgradeError {
                     f,
                     "{}",
                     t!(
-                        "`{process}` failed: {exit_satus} with {output}",
+                        "`{process}` failed: {exit_status} with {output}",
                         process = process,
                         exit_status = exit_status,
                         output = output