diff options
Diffstat (limited to 'server/tools/src/book_html.rs')
-rw-r--r-- | server/tools/src/book_html.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/server/tools/src/book_html.rs b/server/tools/src/book_html.rs index f915444b..08a12e88 100644 --- a/server/tools/src/book_html.rs +++ b/server/tools/src/book_html.rs @@ -16,14 +16,16 @@ */ -use hurrycurry_locale::Locale; +use crate::diagram_svg::diagram_svg; +use hurrycurry_locale::{ + Locale, + message::{MessageDisplayExt, PLAIN}, +}; use hurrycurry_protocol::{ Gamedata, Message, book::{Book, BookPage, Diagram}, }; -use crate::diagram_svg::diagram_svg; - pub fn render_html_book(data: &Gamedata, book: &Book, locale: &Locale) -> String { BookR { book, data, locale }.to_string() } @@ -43,6 +45,7 @@ markup::define! { } } } + PageR<'a>(index: usize, data: &'a Gamedata, locale: &'a Locale, page: &'a BookPage) { section.pagegroup[id=format!("page{index}")] { @match page { @@ -77,12 +80,7 @@ markup::define! { } MessageR<'a>(data: &'a Gamedata, locale: &'a Locale, message: &'a Message) { - @match message { - Message::Translation { id, params } => { @format!("{:?}", (id, params)) } - Message::Text(t) => { @t } - Message::Item(i) => { @data.item_name(*i) } - Message::Tile(i) => { @data.tile_name(*i) } - } + @message.display_message(*locale, *data, &PLAIN) } DiagramR<'a>(data: &'a Gamedata, diagram: &'a Diagram) { |