New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localization #159

Merged
merged 50 commits into from Nov 9, 2018

Conversation

Projects
None yet
5 participants
@asonix
Collaborator

asonix commented Nov 9, 2018

I stole @BanjoFox 's branch and made it work again. Rocket + Tera works, Actix + Tera does not. I don't want to spend too much time re-architecting rocket_i18n when it's gonna update soon and break everything again anyway. I'll hack on the next version when it's released.

Fresh start on the i18n translation.
Using the same underlying (Gettextrs) architecture as our friends over at [Plume](https://github.com/Plume-org/Plume)
Basically this is the main scaffolding for the templates, and I am almost 9*10^1111 percent certain that I am missing something key for this,
but oh well I have to make a "first commit" at some point... could be worse.  I could be using a cute/amusing branch name.

This branch is Tera templates, and starting language files only!  Tying everything into the Rust backend will be part of a separate branch.
I am trying very hard to keep new branches minimal, and focused.
@BaptisteGelez

This comment has been minimized.

BaptisteGelez commented on lang/aardwolf.pot in 7bfafff Jun 22, 2018

I think comments starts by # (or GitHub syntax highlighting is just complaining for nothing)

@m4sk1n

This comment has been minimized.

Contributor

m4sk1n commented on lang/pl.po in 7bfafff Jun 22, 2018

wtf is this? it’s not gettext format…

This comment has been minimized.

BaptisteGelez replied Jun 22, 2018

I think it is a WIP. The translations were in .TOML files before if I understand correctly.

BanjoFox added some commits Jun 22, 2018

Updating Comments
Converting from Rust-internal comments ( // ) to Gettext translator-comments ( # )
Update comments
Converting from Rust-internal comments ( // ) to Gettext translator-comments ( # )
Update comments
Converting from Rust-internal comments ( // ) to Gettext translator-comments ( # )
Housekeeping
Removing Handlebars templates from /Templates
Removing TOML files from /lang
Removing old REAMD from /lang
Adding Rust components to rocket_i18n
Really hoping it went into the right place -.-
Uh....
Not sure why there are so many files, but ooookay.
Ran '''caro fmt''' as well as other stuff I have basically forgotten at this point -.-
Updating rocket 0.4.0-dev
Moved the following packages to very specific commits
rocket = "=0.3.14"
rocket_codegen = "=0.3.14"
// Removed
//
ring = "0.11"

// Changed
//
rocket = "=0.3.14"
rocket_codegen = "=0.3.14"

[dependencies.rocket_contrib]
version = "=0.3.14"
default-features = false
features = ["handlebars_templates", "json"]

// New versions
//
[dependencies.rocket]
git = "https://github.com/SergioBenitez/Rocket"
rev = "df7111143e466c18d1f56377a8d9530a5a306aba"

[dependencies.rocket_codegen]
git = "https://github.com/SergioBenitez/Rocket"
rev = "df7111143e466c18d1f56377a8d9530a5a306aba"

[dependencies.rocket_contrib]
git = "https://github.com/SergioBenitez/Rocket"
rev = "df7111143e466c18d1f56377a8d9530a5a306aba"
default-features = false
features = ["tera_templates", "json"]
Adding Crates.io rocket_i18n
Reverting to the working Cargo.toml/.lock files from Master, and adding `rocket_i18n = "0.1.0"` instead

BanjoFox and others added some commits Jul 8, 2018

I18n templates (#144)
* Fix compatibility issues between rocket and the i18n crate

* Fix directory setup for rocket_i18n

* Fix .po files

* Ignore some generated translation files

* Partially restore the Polish translation

Some strings are missing, and the plurals are probably wrong
Updating templates (serious this time)
created a -real- base.html to test with
will need to clean up other stuff later
Updating example.toml
easier than doing (yet another) merge
Updating Cargo versions.
This branch requires Pear (master) because of this:#![feature(proc_macro_non_items)] --> #![feature(proc_macro_hygiene)]
SergioBenitez/Pear@d221e16
More template work.
Playing with versions, updating some things.  This branch will need a lot of cleanup later.
Fix i18n-templates branch to compile (#153)
* Fix i18n-templates branch to compile

* Remove tree.log
Everything compiles, rocket works. Actix is broken.
Actix doesn't work because rocket_i18n isn't set up to work
with it. rocket_i18n is also undergoing some big changes so
we should look forward to getting those in as soon as possible.
After that, we can get the actix integration up and running
@BanjoFox

Approved.

Thank you again, for all your tremendous work :)

@BanjoFox BanjoFox referenced this pull request Nov 9, 2018

Closed

I18n templates #158

@asonix asonix merged commit 1d68332 into master Nov 9, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@asonix asonix deleted the asonix/i18n branch Nov 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment