merits

m00nwtchr · Apr 7, 2023 · 70041b3 · 70041b3
1 parent 824e5d0
commit 70041b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/cofd/app/src/component/merits.rs b/cofd/app/src/component/merits.rs
@@ -9,7 +9,7 @@ use cofd::{prelude::*, splat::Merit};
 
 use crate::{
 	fl,
-	i18n::Translated,
+	i18n::{flt, Translated},
 	widget::dots::{Shape, SheetDots},
 	Element, H3_SIZE, INPUT_PADDING, TITLE_SPACING,
 };
@@ -77,7 +77,7 @@ impl<Message> Component<Message, iced::Renderer> for MeritComponent<Message> {
 
 		vec.push(Merit::_Custom(format!(
 			"--- {} Merits ---",
-			character.splat.name()
+			flt(character.splat.name(), None).unwrap()
 		)));
 		vec.extend(character.splat.merits());
 

diff --git a/cofd/app/src/i18n.rs b/cofd/app/src/i18n.rs
@@ -60,15 +60,6 @@ pub fn flt(message_id: &str, attribute: Option<&str>) -> Option<String> {
 	message.take()
 }
 
-pub fn fll(key: &str) -> Option<String> {
-	let mut iter = key.split('.');
-
-	let message_id = iter.next().unwrap();
-	let attribute = iter.next();
-
-	flt(message_id, attribute)
-}
-
 // #[derive(Debug, Clone, PartialEq, Eq)]
 // pub enum Locale {
 // 	System,

diff --git a/cofd/app/src/view/overview.rs b/cofd/app/src/view/overview.rs
@@ -240,7 +240,9 @@ where
 						flag = true;
 					}
 
-					character.merits.insert(i, (ability, val));
+					if !ability.name().is_empty() {
+						character.merits.insert(i, (ability, val));
+					}
 				}
 
 				if flag {