Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow-up from i18n-helpers MR

Browse Source
This commit is contained in:
juliancoffee 2022-09-30 23:14:25 +03:00
parent dd5523785c
commit 9dc07a38db
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab/scripts/code-quality.sh
View File

@ -1,6 +1,16 @@
#!/bin/bash
# cargo clippy is a superset of cargo check, so we don't check manually
time cargo clippy --all-targets --locked --features="bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak" -- -D warnings &&
time cargo clippy \
--all-targets \
--locked \
--features="bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak,bin,stat" \
-- -D warnings &&
# Ensure that the veloren-voxygen default-publish feature builds as it excludes some default features
time cargo clippy -p veloren-voxygen --locked --no-default-features --features="default-publish" -- -D warnings &&
time cargo clippy -p \
veloren-voxygen --locked \
--no-default-features \
--features="default-publish" \
-- -D warnings &&
time cargo fmt --all -- --check

2
client/examples/chat-cli/main.rs
View File

@ -99,7 +99,7 @@ fn main() {
"{}",
localize_chat_message(
m,
|msg| client.lockup_msg_context(msg),
|msg| client.lookup_msg_context(msg),
&localisation.read(),
SHOW_NAME,
)

2
client/i18n/src/bin/i18n-check.rs
View File

@ -1,6 +1,6 @@
use clap::{Arg, Command};
use common_assets::find_root;
use veloren_voxygen_i18n::{
use veloren_client_i18n::{
analysis::{Language, ReferenceLanguage},
REFERENCE_LANG,
};

4
client/i18n/src/bin/i18n-csv.rs
View File

@ -1,6 +1,6 @@
use common_assets::find_root;
use std::{fs, io::Write, path::Path};
use veloren_voxygen_i18n::{
use veloren_client_i18n::{
analysis::{Language, ReferenceLanguage},
list_localizations, REFERENCE_LANG,
};
@ -26,7 +26,7 @@ fn main() {
.and_then(|s| s.to_str())
.unwrap_or("<err>");
format!("{file}")
file.to_string()
};
for meta in list {
let code = meta.language_identifier;

4
client/src/lib.rs
View File

@ -2643,7 +2643,7 @@ impl Client {
/// Get important information from client that is necessary for message
/// localisation
pub fn lockup_msg_context(&self, msg: &comp::ChatMsg) -> ChatTypeContext {
pub fn lookup_msg_context(&self, msg: &comp::ChatMsg) -> ChatTypeContext {
let mut result = ChatTypeContext {
you: self.uid().expect("Client doesn't have a Uid!!!"),
player_alias: HashMap::new(),
@ -2861,7 +2861,7 @@ mod tests {
let msg: comp::ChatMsg = msg;
let _s: String = localize_chat_message(
msg,
|msg| client.lockup_msg_context(msg),
|msg| client.lookup_msg_context(msg),
&localisation.read(),
true,
)

2
voxygen/src/hud/chat.rs
View File

@ -421,7 +421,7 @@ impl<'a> Widget for Chat<'a> {
.map(|m| {
localize_chat_message(
m.clone(),
|msg| self.client.lockup_msg_context(msg),
|msg| self.client.lookup_msg_context(msg),
self.localized_strings,
show_char_name,
)