Localization

.gitignore

@@ -20,3 +20,7 @@ diesel.toml
 .config
 
 node_modules
+
+# Translations
+.po~
+translations

Cargo.toml

@@ -9,7 +9,8 @@ members = [
     "aardwolf-models",
     "aardwolf-types",
     "aardwolf-rocket",
-    "aardwolf-actix"
+    "aardwolf-actix",
+    "rocket_i18n"
 ]
 
 [features]

INSTALL.md

@@ -5,7 +5,7 @@ run. At the moment it has only been tested on linux, OSX, and Windows 10.
 
 > NOTE: These instructions may help in installing a production version, but are
 intended for developers to be able to build and test their changes. If in doubt,
-seek out documentation from your distribution package or from [the `doc` folder](doc).
+seek out documentation from your distribution package or from the [`doc`](doc) folder.
 
 ## Installing Requirements
 
@@ -15,20 +15,20 @@ In order to run the Aardwolf backend, you will need to have access to a
 this guide we’re going to assume you are running the database on your
 development machine.
 
-Full Details can be found here:
-[INSTALL-POSTGRES.md](/doc/INSTALL-POSTGRES.md)
-[SETUP-POSTGRES.md](/doc/SETUP-POSTGRES.md)
+Full details can be found here:
 
+- [INSTALL-POSTGRES.md](/doc/INSTALL-POSTGRES.md)
+- [SETUP-POSTGRES.md](/doc/SETUP-POSTGRES.md)
 
 ### Installing Rust Environment
 
 Next, you’ll need to have the [Rust](https://rust-lang.org/) toolchain
 installed. The best way to do this is to install
 [rustup](https://rustup.rs), which is a Rust toolchain manager.
 
-Full Details can be found here:
-[INSTALL-RUST.md](/doc/INSTALL-RUST.md)
+Full details can be found here:
 
+- [INSTALL-RUST.md](/doc/INSTALL-RUST.md)
 
 ## Getting the source
 
@@ -47,14 +47,28 @@ We could continue to use the `+nightly` feature whenever we run a
 override so cargo will know to use nightly by default whenever we’re in
 our project directory. In the `aardwolf` directory, run
 
-    $ rustup override add nightly
+    $ rustup override set nightly
 
 From now on, you won't have to use `+nightly` to run the correct
 toolchain version.
 
+__NOTE: For i18n-templates branch__
+
+Currently to compile on the `i18n-templates` branch, the nightly version is pinned to `nightly-2018-07-17` (see [`rust_toolchain`](rust_toolchain)). To Install this specific version of nightly, run
+
+    $ rustup install nightly-2018-07-17
+
+Then to set this nightly version on the project directory, in the `aardwolf` directory, run
+
+    $ rustup override set nightly-2018-07-17
+
+To verify that the version in the project directory is what we just set, in the `aardwolf` directory, run
+
+    $ rustup show
+
 ## Configuring the server
 
-Currently, Aardwolf expects aardwolf.toml to be in the root of the project
+Currently, Aardwolf expects `aardwolf.toml` to be in the root of the project
 directory. To get started, copy
 [`config/example.toml`](config/example.toml) to
 `./aardwolf.toml` and adjust the values accordingly. 

aardwolf-actix/Cargo.toml

@@ -11,13 +11,13 @@ collection_macros = "0.2.0"
 config = "0.9.0"
 failure = "0.1"
 futures = "0.1"
-handlebars = "1.1"
 log = "0.4"
 r2d2 = "0.8"
 r2d2-diesel = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
+tera = "0.11"
 
 [dependencies.aardwolf-models]
 version = "0.1"
@@ -32,3 +32,7 @@ features = ["use-actix"]
 version = "1.1"
 default-features = false
 features = ["postgres", "uuid", "chrono"]
+
+[dependencies.rocket_i18n]
+version = "0.1"
+path = "../rocket_i18n"

aardwolf-actix/src/lib.rs

@@ -22,8 +22,9 @@ use actix_web::{
 };
 use config::Config;
 use diesel::pg::PgConnection;
-use handlebars::Handlebars;
 use r2d2_diesel::ConnectionManager;
+use rocket_i18n::I18n;
+use tera::Tera;
 
 #[macro_use]
 pub mod action;
@@ -40,7 +41,8 @@ use self::db::{Db, Pool};
 #[derive(Clone)]
 pub struct AppConfig {
     db: Addr<Db>,
-    templates: Arc<Handlebars>,
+    templates: Arc<Tera>,
+    i18n: Arc<I18n>,
 }
 
 impl fmt::Debug for AppConfig {
@@ -51,12 +53,28 @@ impl fmt::Debug for AppConfig {
 
 impl AppConfig {
     fn render<T: serde::Serialize>(&self, template: &str, data: &T) -> error::RenderResult {
-        self.templates
-            .render(template, data)
-            .map(|s| HttpResponse::Ok().header(CONTENT_TYPE, "text/html").body(s))
+        let attempts = vec![
+            template.to_owned(),
+            format!("{}.html", template),
+            format!("{}.html.tera", template),
+        ];
+
+        let res = attempts
+            .iter()
+            .fold(None, |acc, template_name| {
+                acc.or_else(|| {
+                    self.templates
+                        .render(template_name, data)
+                        .map_err(|e| error!("Error rendering, {}, {:?}", e, e))
+                        .ok()
+                })
+            })
+            .ok_or(error::RenderError);
+
+        res.map(|s| HttpResponse::Ok().header(CONTENT_TYPE, "text/html").body(s))
             .map_err(|e| {
-                error!("Unable to render template, {}", e);
-                error::RenderError
+                error!("Unable to render template");
+                e
             })
     }
 }
@@ -117,8 +135,8 @@ pub fn run(config: Config, database_url: String) -> Result<(), Box<dyn Error>> {
 
     let template_dir = config.get_str("Templates.dir")?;
 
-    let mut templates = Handlebars::new();
-    templates.register_templates_directory(".html.hbs", &template_dir)?;
+    let mut templates = Tera::new(&template_dir)?;
+    rocket_i18n::tera(&mut templates);
 
     let templates = Arc::new(templates);
 
@@ -129,6 +147,7 @@ pub fn run(config: Config, database_url: String) -> Result<(), Box<dyn Error>> {
         let state = AppConfig {
             db: db.clone(),
             templates: templates.clone(),
+            i18n: Arc::new(I18n::new("aardwolf")),
         };
 
         vec![

aardwolf-actix/src/routes/personas.rs

@@ -1,6 +1,7 @@
 use aardwolf_types::{
     error::AardwolfFail,
     forms::personas::{
+        CheckCreatePersonaPermission, CheckCreatePersonaPermissionFail,
         CheckDeletePersonaPermission, CreatePersona, DeletePersona, FetchPersona,
         PersonaCreationFail, PersonaCreationForm, PersonaDeletionFail, ValidatePersonaCreationForm,
     },
@@ -42,6 +43,25 @@ impl From<PersonaCreationFail> for PersonaCreateError {
     }
 }
 
+impl From<CheckCreatePersonaPermissionFail> for PersonaCreateError {
+    fn from(e: CheckCreatePersonaPermissionFail) -> Self {
+        match e {
+            CheckCreatePersonaPermissionFail::Database => PersonaCreateError::Database,
+            CheckCreatePersonaPermissionFail::Permission => PersonaCreateError::Permission,
+        }
+    }
+}
+
+impl From<DbActionError<CheckCreatePersonaPermissionFail>> for PersonaCreateError {
+    fn from(e: DbActionError<CheckCreatePersonaPermissionFail>) -> Self {
+        match e {
+            DbActionError::Connection => PersonaCreateError::Database,
+            DbActionError::Mailbox => PersonaCreateError::Mailbox,
+            DbActionError::Action(e) => e.into(),
+        }
+    }
+}
+
 impl From<DbActionError<PersonaCreationFail>> for PersonaCreateError {
     fn from(e: DbActionError<PersonaCreationFail>) -> Self {
         match e {
@@ -61,7 +81,8 @@ pub(crate) fn create(
         PersonaCreateError,
         [
             (ValidateWrapper<_, _, _> => ValidatePersonaCreationForm),
-            (DbActionWrapper<_, _, _> => CreatePersona::new(user.0)),
+            (DbActionWrapper<_, _, _> => CheckCreatePersonaPermission::new(user.0)),
+            (DbActionWrapper<_, _, _> => CreatePersona),
         ]
     );
 

aardwolf-models/Cargo.toml

@@ -12,7 +12,6 @@ failure = "0.1"
 log = "0.4"
 mime = "0.3"
 rand = "0.5"
-rocket = { version = "0.3.14", optional = true }
 serde = "1.0"
 serde_json = "1.0"
 url = "1.7"
@@ -24,6 +23,10 @@ default = []
 version = "1.2"
 features = ["chrono", "postgres", "serde_json"]
 
+[dependencies.rocket]
+version = "0.4.0-rc.1"
+optional = true
+
 [dev-dependencies]
 dotenv = "0.13"
 env_logger = "0.5"

aardwolf-rocket/Cargo.toml

@@ -15,8 +15,6 @@ config = "0.9.0"
 failure = "0.1.1"
 r2d2 = "0.8"
 r2d2-diesel = "1.0"
-rocket = "0.3.17"
-rocket_codegen = "0.3.17"
 serde = "1.0.21"
 log = "0.4.1"
 
@@ -39,7 +37,16 @@ version = "1.1"
 default-features = false
 features = ["postgres", "uuid", "chrono"]
 
+[dependencies.rocket]
+version = "0.4.0-rc.1"
+
+[dependencies.rocket_codegen]
+version = "0.4.0-rc.1"
+
 [dependencies.rocket_contrib]
-version = "0.3.17"
-default-features = false
-features = ["handlebars_templates", "json"]
+version = "0.4.0-rc.1"
+features = ["tera_templates", "json"]
+
+[dependencies.rocket_i18n]
+version = "0.1"
+path = "../rocket_i18n"

aardwolf-rocket/src/lib.rs

@@ -1,7 +1,5 @@
 #![recursion_limit = "128"]
-#![feature(plugin)]
-#![feature(custom_derive)]
-#![plugin(rocket_codegen)]
+#![feature(custom_derive, proc_macro_hygiene, decl_macro)]
 
 extern crate aardwolf_models;
 extern crate aardwolf_types;
@@ -16,8 +14,10 @@ extern crate diesel;
 extern crate failure;
 extern crate r2d2;
 extern crate r2d2_diesel;
+#[macro_use]
 extern crate rocket;
 extern crate rocket_contrib;
+extern crate rocket_i18n;
 extern crate serde;
 
 use diesel::pg::PgConnection;
@@ -27,7 +27,6 @@ use rocket::{
     request::{self, FromRequest},
     Outcome, Request, Rocket, State,
 };
-use rocket_contrib::Template;
 use std::{error::Error, ops::Deref};
 
 #[macro_use]
@@ -73,46 +72,52 @@ fn app(config: config::Config, db_url: String) -> Result<Rocket, Box<dyn Error>>
         .extra("database_url", db_url.as_str())
         .unwrap();
 
-    let mut routes = routes![self::routes::app::home, self::routes::app::home_redirect,];
+    let mut routes = routes![routes::app::home, routes::app::home_redirect,];
 
     #[cfg(debug_assertions)]
     routes.extend(routes![
         // webroot/favicon
-        self::routes::app::webroot,
+        routes::app::webroot,
         // emoji
-        self::routes::app::emoji,
+        routes::app::emoji,
         // themes
-        self::routes::app::themes,
+        routes::app::themes,
     ]);
 
     let auth = routes![
-        self::routes::auth::sign_up_form,
-        self::routes::auth::sign_up_form_with_error,
-        self::routes::auth::sign_in_form,
-        self::routes::auth::sign_in_form_with_error,
-        self::routes::auth::sign_up,
-        self::routes::auth::sign_in,
-        self::routes::auth::confirm,
-        self::routes::auth::sign_out,
+        routes::auth::sign_up_form,
+        routes::auth::sign_up_form_with_error,
+        routes::auth::sign_in_form,
+        routes::auth::sign_in_form_with_error,
+        routes::auth::sign_up,
+        routes::auth::sign_in,
+        routes::auth::confirm,
+        routes::auth::sign_out,
     ];
 
     let personas = routes![
-        self::routes::personas::new,
-        self::routes::personas::create,
-        self::routes::personas::delete,
-        self::routes::personas::switch,
+        routes::personas::new,
+        routes::personas::create,
+        routes::personas::delete,
+        routes::personas::switch,
     ];
 
-    let r = rocket::custom(c, true)
+    let r = rocket::custom(c)
         .mount("/auth", auth)
         .mount("/personas", personas)
         .mount(
             "/api/v1",
-            routes![self::routes::applications::register_application],
+            routes![routes::applications::register_application],
         )
         .mount("/", routes)
-        .attach(Template::fairing());
-    // .manage(SystemRandom::new());
+        // .manage(SystemRandom::new());
+        // Just for giggles, what happens if I put the rocket_i18n fairing here....
+        // Register the fairing. The parameter is the domain you want to use (the name of your app most of the time)
+        .attach(rocket_i18n::I18n::new("aardwolf"))
+        // Eventually register the Tera filters (only works with the master branch of Rocket)
+        .attach(rocket_contrib::templates::Template::custom(|engines| {
+            rocket_i18n::tera(&mut engines.tera);
+        }));
 
     // we need an instance of the app to access the config values in Rocket.toml,
     // so we pass it to the db_pool function, get the pool, and _then_ return the instance