diff --git a/messages/frontend/de.msg b/messages/frontend/de.msg new file mode 100644 index 000000000..f01c31640 --- /dev/null +++ b/messages/frontend/de.msg @@ -0,0 +1,4 @@ +FilesSelected: Dateien ausgewählt +SelectFile: Datei auswählen +SelectFiles: Datei(en) auswählen +AsyncFormFailure: Da ist etwas schief gelaufen, das tut uns Leid. Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben. Vielen Dank für deine Hilfe! \ No newline at end of file diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg index a33c06e1c..468a3c484 100644 --- a/messages/uniworx/de.msg +++ b/messages/uniworx/de.msg @@ -294,7 +294,10 @@ Settings: Individuelle Benutzereinstellungen SettingsUpdate: Einstellungen wurden gespeichert. Never: Nie +PreviouslyUploadedInfo: Bereits hochgeladene Dateien: +PreviouslyUploadedDeletionInfo: (Nicht ausgewählte Dateien werden gelöscht) MultiFileUploadInfo: (Mehrere Dateien mit Shift oder Strg auswählen) +AddMoreFiles: Weitere Dateien hinzufügen: NrColumn: Nr SelectColumn: Auswahl @@ -731,4 +734,4 @@ DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeile sind"} aus de MassInputAddDimension: Hinzufügen MassInputDeleteCell: Entfernen -NavigationFavourites: Favoriten \ No newline at end of file +NavigationFavourites: Favoriten diff --git a/src/Foundation.hs b/src/Foundation.hs index e689643da..f85e69e54 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -187,6 +187,7 @@ mkMessageVariant "UniWorX" "Campus" "messages/campus" "de" mkMessageVariant "UniWorX" "Dummy" "messages/dummy" "de" mkMessageVariant "UniWorX" "PWHash" "messages/pw-hash" "de" mkMessageVariant "UniWorX" "Button" "messages/button" "de" +mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de" -- This instance is required to use forms. You can modify renderMessage to -- achieve customized and internationalized form validation messages. @@ -1053,6 +1054,11 @@ siteLayout' headingOverride widget = do hasSecondaryPageActions = any (is _PageActionSecondary) $ toListOf (traverse . _1 . _menuItemType) menuTypes hasPrimaryPageActions = any (is _PageActionPrime) $ toListOf (traverse . _1 . _menuItemType) menuTypes + MsgRenderer mr <- getMsgRenderer + let + -- See Utils.Frontend.I18n and files in messages/frontend for message definitions + frontendI18n = toJSON (mr :: FrontendMessage -> Text) + pc <- widgetToPageContent $ do -- 3rd party addScript $ StaticR js_vendor_flatpickr_js @@ -1064,20 +1070,21 @@ siteLayout' headingOverride widget = do -- polyfills addScript $ StaticR js_polyfills_fetchPolyfill_js addScript $ StaticR js_polyfills_urlPolyfill_js + -- JavaScript services + addScript $ StaticR js_services_utilRegistry_js + addScript $ StaticR js_services_httpClient_js + addScript $ StaticR js_services_i18n_js -- JavaScript utils addScript $ StaticR js_utils_alerts_js addScript $ StaticR js_utils_asidenav_js addScript $ StaticR js_utils_asyncForm_js addScript $ StaticR js_utils_asyncTable_js - addScript $ StaticR js_utils_asyncTableFilter_js addScript $ StaticR js_utils_checkAll_js - addScript $ StaticR js_utils_httpClient_js addScript $ StaticR js_utils_form_js addScript $ StaticR js_utils_inputs_js addScript $ StaticR js_utils_modal_js - addScript $ StaticR js_utils_setup_js addScript $ StaticR js_utils_showHide_js - addScript $ StaticR js_utils_tabber_js + -- addScript $ StaticR js_utils_tabber_js addStylesheet $ StaticR css_utils_alerts_scss addStylesheet $ StaticR css_utils_asidenav_scss addStylesheet $ StaticR css_utils_asyncForm_scss diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index 4d53f5eed..4e4b07eee 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -121,7 +121,7 @@ postAdminTestR = do let emailWidget' = wrapForm emailWidget def { formAction = Just . SomeRoute $ AdminTestR , formEncoding = emailEnctype - , formAttrs = [("data-ajax-submit", "")] + , formAttrs = [("uw-async-form", "")] } diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs index dba365b9c..81d9f7066 100644 --- a/src/Handler/Home.hs +++ b/src/Handler/Home.hs @@ -170,4 +170,4 @@ homeUpcomingSheets uid = do , dbtParams = def , dbtIdent = "upcoming-sheets" :: Text } - $(widgetFile "home/upcomingSheets") + $(widgetFile "home/upcomingSheets") \ No newline at end of file diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 5de418a34..00ac76742 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -116,10 +116,11 @@ postProfileR = do siteLayout [whamlet|_{MsgProfileFor} ^{nameWidget userDisplayName userSurname}|] $ do setTitle . toHtml $ "Profil " <> userIdent - wrapForm formWidget def - { formAction = Just $ SomeRoute ProfileR - , formEncoding = formEnctype - } + let settingsForm = wrapForm formWidget def + { formAction = Just $ SomeRoute ProfileR + , formEncoding = formEnctype + } + $(widgetFile "profile") getProfileDataR :: Handler Html diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs index 811da9e2f..2acaf2a6a 100644 --- a/src/Handler/Utils/Table.hs +++ b/src/Handler/Utils/Table.hs @@ -63,6 +63,7 @@ headedRowSelector toExternal fromExternal attrs colonnade tdata = do -> return Nothing view _ name attributes val _ = + -- TODO: move this to a *.hamlet file [whamlet|