commit 934c0f36b5964dd7ab8501da61420e6df88b9b94 parent bd865a974e08896e1d392d6e2be5546a599e69f0 Author: Marcel <mtrnord1@gmail.com> Date: Sun, 7 Jun 2020 14:40:15 +0200 Add sync filters and more translation terms Took 5 minutes Diffstat:
24 files changed, 172 insertions(+), 49 deletions(-)
diff --git a/i18n/mo/de/daydream.mo b/i18n/mo/de/daydream.mo Binary files differ. diff --git a/i18n/po/de/daydream.po b/i18n/po/de/daydream.po @@ -1,11 +1,34 @@ msgid "" msgstr "" +"Project-Id-Version: Daydream\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: POEditor.com\n" -"Project-Id-Version: Daydream\n" -"Language: de\n" + +#. Placeholder text for the roomlist filtering +#: src/app/components/room_list.rs:161 +msgid "Filter Rooms..." +msgstr "" + +#. Header of the Roomlist +#: src/app/components/room_list.rs:173 +msgid "Rooms" +msgstr "" + +#. The Login Button of the Login page +#: src/app/views/login.rs:169 src/app/views/login.rs:280 +msgid "Login" +msgstr "Anmelden" + +#. {0} is the Error that happened on login +#. The error message of the Login page +#: src/app/views/login.rs:182 +msgid "Error: {0}" +msgstr "Fehler: {0}" #. The URL Field of the Login page #: src/app/views/login.rs:201 src/app/views/login.rs:214 @@ -22,14 +45,7 @@ msgstr "MXID" msgid "Password" msgstr "Passwort" -#. The Login Button of the Login page -#: src/app/views/login.rs:169 src/app/views/login.rs:280 -msgid "Login" -msgstr "Anmelden" - -#. {0} is the Error that happened on login -#. The error message of the Login page -#: src/app/views/login.rs:182 -msgid "Error: {0}" -msgstr "Fehler: {0}" - +#. A warning for encrypted rooms +#: src/app/views/main_view.rs:81 +msgid "Daydream currently does not support encryption." +msgstr "" diff --git a/i18n/pot/daydream.pot b/i18n/pot/daydream.pot @@ -1,11 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE daydream'S COPYRIGHT HOLDER +# This file is distributed under the same license as the daydream package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy msgid "" msgstr "" +"Project-Id-Version: daydream 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: POEditor.com\n" -"Project-Id-Version: Daydream\n" -"Language: en\n" + +#. Placeholder text for the roomlist filtering +#: src/app/components/room_list.rs:161 +msgid "Filter Rooms..." +msgstr "" + +#. Header of the Roomlist +#: src/app/components/room_list.rs:173 +msgid "Rooms" +msgstr "" + +#. The Login Button of the Login page +#: src/app/views/login.rs:169 src/app/views/login.rs:280 +msgid "Login" +msgstr "" + +#. {0} is the Error that happened on login +#. The error message of the Login page +#: src/app/views/login.rs:182 +msgid "Error: {0}" +msgstr "" #. The URL Field of the Login page #: src/app/views/login.rs:201 src/app/views/login.rs:214 @@ -22,14 +53,7 @@ msgstr "" msgid "Password" msgstr "" -#. The Login Button of the Login page -#: src/app/views/login.rs:169 src/app/views/login.rs:280 -msgid "Login" -msgstr "" - -#. {0} is the Error that happened on login -#. The error message of the Login page -#: src/app/views/login.rs:182 -msgid "Error: {0}" +#. A warning for encrypted rooms +#: src/app/views/main_view.rs:81 +msgid "Daydream currently does not support encryption." msgstr "" - diff --git a/i18n/pot/src/app/components/event_list.pot b/i18n/pot/src/app/components/event_list.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/components/events/image.pot b/i18n/pot/src/app/components/events/image.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/components/events/mod.pot b/i18n/pot/src/app/components/events/mod.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/components/events/notice.pot b/i18n/pot/src/app/components/events/notice.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/components/events/text.pot b/i18n/pot/src/app/components/events/text.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/components/events/video.pot b/i18n/pot/src/app/components/events/video.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/components/mod.pot b/i18n/pot/src/app/components/mod.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,3 +16,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + +#. Placeholder text for the roomlist filtering +#: ./src/app/components/room_list.rs:161 +msgid "Filter Rooms..." +msgstr "" + +#. Header of the Roomlist +#: ./src/app/components/room_list.rs:173 +msgid "Rooms" +msgstr "" diff --git a/i18n/pot/src/app/components/room_list.pot b/i18n/pot/src/app/components/room_list.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,3 +16,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + +#. Placeholder text for the roomlist filtering +#: ./src/app/components/room_list.rs:161 +msgid "Filter Rooms..." +msgstr "" + +#. Header of the Roomlist +#: ./src/app/components/room_list.rs:173 +msgid "Rooms" +msgstr "" diff --git a/i18n/pot/src/app/matrix/mod.pot b/i18n/pot/src/app/matrix/mod.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/matrix/sync.pot b/i18n/pot/src/app/matrix/sync.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/matrix/types.pot b/i18n/pot/src/app/matrix/types.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/mod.pot b/i18n/pot/src/app/mod.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,6 +17,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#. Placeholder text for the roomlist filtering +#: ./src/app/components/room_list.rs:161 +msgid "Filter Rooms..." +msgstr "" + +#. Header of the Roomlist +#: ./src/app/components/room_list.rs:173 +msgid "Rooms" +msgstr "" + #. The Login Button of the Login page #: ./src/app/views/login.rs:169 ./src/app/views/login.rs:280 msgid "Login" @@ -42,3 +52,8 @@ msgstr "" #: ./src/app/views/login.rs:252 ./src/app/views/login.rs:265 msgid "Password" msgstr "" + +#. A warning for encrypted rooms +#: ./src/app/views/main_view.rs:81 +msgid "Daydream currently does not support encryption." +msgstr "" diff --git a/i18n/pot/src/app/views/login.pot b/i18n/pot/src/app/views/login.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/app/views/main_view.pot b/i18n/pot/src/app/views/main_view.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,3 +16,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + +#. A warning for encrypted rooms +#: ./src/app/views/main_view.rs:81 +msgid "Daydream currently does not support encryption." +msgstr "" diff --git a/i18n/pot/src/app/views/mod.pot b/i18n/pot/src/app/views/mod.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,3 +42,8 @@ msgstr "" #: ./src/app/views/login.rs:252 ./src/app/views/login.rs:265 msgid "Password" msgstr "" + +#. A warning for encrypted rooms +#: ./src/app/views/main_view.rs:81 +msgid "Daydream currently does not support encryption." +msgstr "" diff --git a/i18n/pot/src/constants.pot b/i18n/pot/src/constants.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/errors.pot b/i18n/pot/src/errors.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/i18n/pot/src/lib.pot b/i18n/pot/src/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: daydream 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 21:19+0000\n" +"POT-Creation-Date: 2020-06-07 12:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,6 +17,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#. Placeholder text for the roomlist filtering +#: ./src/app/components/room_list.rs:161 +msgid "Filter Rooms..." +msgstr "" + +#. Header of the Roomlist +#: ./src/app/components/room_list.rs:173 +msgid "Rooms" +msgstr "" + #. The Login Button of the Login page #: ./src/app/views/login.rs:169 ./src/app/views/login.rs:280 msgid "Login" @@ -42,3 +52,8 @@ msgstr "" #: ./src/app/views/login.rs:252 ./src/app/views/login.rs:265 msgid "Password" msgstr "" + +#. A warning for encrypted rooms +#: ./src/app/views/main_view.rs:81 +msgid "Daydream currently does not support encryption." +msgstr "" diff --git a/src/app/components/room_list.rs b/src/app/components/room_list.rs @@ -4,11 +4,13 @@ use matrix_sdk::{identifiers::RoomId, js_int::UInt, Room}; use serde::{Deserialize, Serialize}; use wasm_bindgen::JsCast; use web_sys::HtmlElement; +use yew::{Bridge, Bridged, Component, ComponentLink, Html}; use yew::prelude::*; use yew::utils::document; -use yew::{Bridge, Bridged, Component, ComponentLink, Html}; use yewtil::NeqAssign; +use tr::tr; + use crate::app::matrix::{MatrixAgent, Request, Response}; pub struct RoomList { @@ -153,13 +155,25 @@ impl Component for RoomList { <input class="uk-search-input" type="search" - placeholder="Filter Rooms..." + placeholder={ + tr!( + // Placeholder text for the roomlist filtering + "Filter Rooms..." + ) + } value=&self.state.search_query.as_ref().unwrap_or(&"".to_string()) oninput=self.link.callback(|e: InputData| Msg::SetFilter(e.value)) /> </form> </div> <ul class="scrollable uk-flex uk-flex-column uk-padding uk-nav-default uk-nav-parent-icon uk-padding-remove-bottom" uk-nav=""> - <li class="uk-nav-header">{"Rooms"}</li> + <li class="uk-nav-header"> + { + tr!( + // Header of the Roomlist + "Rooms" + ) + } + </li> { if self.state.search_query.is_none() || (self.state.search_query.as_ref().unwrap_or(&"".to_string()) == &"".to_string()) { self.state.rooms.iter().map(|(_, room)| self.get_room(room)).collect::<Html>() diff --git a/src/app/mod.rs b/src/app/mod.rs @@ -1,6 +1,6 @@ use yew::{prelude::*, virtual_dom::VNode}; -use yew_router::agent::RouteRequest::ChangeRoute; use yew_router::{prelude::*, Switch}; +use yew_router::agent::RouteRequest::ChangeRoute; use crate::app::matrix::{MatrixAgent, Response}; use crate::app::views::{login::Login, main_view::MainView}; diff --git a/src/app/views/main_view.rs b/src/app/views/main_view.rs @@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize}; use yew::ComponentLink; use yew::prelude::*; +use tr::tr; + use crate::app::components::{event_list::EventList, room_list::RoomList}; use crate::app::matrix::{MatrixAgent, Request}; @@ -72,7 +74,14 @@ impl Component for MainView { <RoomList change_room_callback=self.link.callback(Msg::ChangeRoom)/> <div class="container uk-flex uk-flex-column uk-width-5-6 uk-padding uk-padding-remove-bottom" style="height: 100%"> <h1>{ self.state.current_room.as_ref().unwrap().display_name() }</h1> - <h4>{ "Daydream currently does not support encryption." }</h4> + <h4> + { + tr!( + // A warning for encrypted rooms + "Daydream currently does not support encryption." + ) + } + </h4> </div> </div> }