Skip to content

Commit

Permalink
Merge branch 'dev' for release 2.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvainbx committed Apr 27, 2017
2 parents 6127812 + 5981aa3 commit 186b1ee
Show file tree
Hide file tree
Showing 114 changed files with 22,429 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .fabmanager-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.2
2.5.3
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
# Changelog Fab Manager

## v2.5.2 April 12
## v2.5.3 2017 April 27

- Project view: added responsive support on external images
- Include rails localization support for 115 new locations

## v2.5.2 2017 April 12

- Extracts first admin created email and password into environment variables
- [OPTIONAL: Only for a new installation] add `ADMIN_EMAIL` and `ADMIN_PASSWORD` environment variable in `application.yml` or `env` file (with docker)

## v2.5.1 2017 March 28

- hide spaces in admin's credit management if spaces are disabled
- Fix a bug : Can not display training tracking (this bug was introduced in version 2.5.0)
- [TODO DEPLOY] `rake assets:precompile`
Expand Down
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -548,13 +548,16 @@ If you are in a development environment, your can keep the default values, other
#### Settings
RAILS_LOCALE
Configure Ruby on Rails for l10n.
Configure Ruby on Rails localization settings (currency, dates, number formats ...).
Be sure that `config/locales/rails.XX.yml` exists, where `XX` match your configured RAILS_LOCALE.
You can find templates of these files at https://github.com/svenfuchs/rails-i18n/tree/rails-4-x/rails/locale.
Please, be aware that **the configured locale will imply the CURRENCY symbol used to generate invoices**.
_Eg.: configuring **es-ES** will set the currency symbol to **€** but **es-MX** will set **$** as currency symbol, so setting the `RAILS_LOCALE` to simple **es** (without country indication) will probably not do what you expect._
Be aware that **this file MUST contain the CURRENCY symbol used to generate invoices** (among other things).
Default is **en**.
See `config/locales/rails.*.yml` for a list of available locales. Default is **en**.
If your locale is not present in that list or any locale doesn't have your exact expectations, please open a pull request to share your modifications with the community and obtain a rebuilt docker image.
You can find templates of these files at https://github.com/svenfuchs/rails-i18n/tree/rails-4-x/rails/locale.

MOMENT_LOCALE

Expand All @@ -576,7 +579,7 @@ Configure the locale for angular-i18n.

Please, be aware that **the configured locale will imply the CURRENCY displayed to front-end users.**

_Eg.: configuring **fr-fr** will set the currency symbol to **€** but **fr-ca** will set **$** as currency symbol, so setting the `angular_locale` to simple **fr** (without country indication) will probably not do what you expect._
_Eg.: configuring **fr-fr** will set the currency symbol to **** but **fr-ca** will set **$** as currency symbol, so setting the `ANGULAR_LOCALE` to simple **fr** (without country indication) will probably not do what you expect._

See `vendor/assets/components/angular-i18n/angular-locale_*.js` for a list of available locales. Default is **en**.

Expand Down
5 changes: 5 additions & 0 deletions app/assets/stylesheets/app.components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@
height: 400px;
}
}
img {
display: block;
max-width: 100%;
height: auto;
}
}

.label-staging {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/templates/projects/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="article wrapper-lg">

<div class="article-thumbnail" ng-if="project.project_image">
<a href="{{project.project_full_image}}" target="_blank"><img ng-src="{{project.project_image}}" alt="{{project.name}}" class="img-responsive"></a>
<a href="{{project.project_full_image}}" target="_blank"><img ng-src="{{project.project_image}}" alt="{{project.name}}"></a>
</div>

<h3 translate>{{ 'project_description' }}</h3>
Expand All @@ -44,7 +44,7 @@
</div>
<div ng-repeat-start="image in step.project_step_images_attributes" class="clearfix" ng-if="$index % 3 == 0"></div>
<div class="col-md-4" ng-repeat-end>
<a href="{{image.attachment_full_url}}" target="_blank"><img class="img-responsive m-b" ng-src="{{image.attachment_url}}" alt="{{image.attachment}}" ></a>
<a href="{{image.attachment_full_url}}" target="_blank"><img class="m-b" ng-src="{{image.attachment_url}}" alt="{{image.attachment}}" ></a>
</div>
<div class="col-md-8" ng-class="{'col-md-12' : step.project_step_images_attributes.length > 1 || step.project_step_images_attributes.length == 0}">

Expand Down
199 changes: 199 additions & 0 deletions config/locales/rails.af.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
---
af:
date:
abbr_day_names:
- Son
- Maan
- Dins
- Woe
- Don
- Vry
- Sat
abbr_month_names:
-
- Jan
- Feb
- Mar
- Apr
- Mei
- Jun
- Jul
- Aug
- Sep
- Okt
- Nov
- Des
day_names:
- Sondag
- Maandag
- Dinsdag
- Woensdag
- Donderdag
- Vrydag
- Saterdag
formats:
default: "%Y-%m-%d"
long: "%B %d, %Y"
short: "%b %d"
month_names:
-
- Januarie
- Februarie
- Maart
- April
- Mai
- Junie
- Julie
- Augustus
- September
- Oktober
- November
- Desember
order:
- :year
- :month
- :day
datetime:
distance_in_words:
about_x_hours:
one: ongeveer 1 uur
other: ongeveer %{count} ure
about_x_months:
one: ongeveer 1 maand
other: ongeveer %{count} maande
about_x_years:
one: ongeveer 1 jaar
other: ongeveer %{count} jaar
almost_x_years:
one: sowat 1 jaar
other: sowat %{count} jaar
half_a_minute: halfminuut
less_than_x_minutes:
one: minder as n minuut
other: minder as %{count} minute
less_than_x_seconds:
one: minder as 1 second
other: minder as %{count} sekondes
over_x_years:
one: meer as 1 jaar
other: meer as %{count} jaar
x_days:
one: 1 dag
other: "%{count} days"
x_minutes:
one: 1 minuut
other: "%{count} minute"
x_months:
one: 1 maand
other: "%{count} maande"
x_seconds:
one: 1 sekonde
other: "%{count} sekondes"
prompts:
day: Dag
hour: Uur
minute: Minuut
month: Maand
second: Sekondes
year: Jaar
errors:
format: "%{attribute} %{message}"
messages:
accepted: moet aanvaar word
blank: mag nie leeg wees nie
confirmation: pas nie by bevestiging nie
empty: mag nie leeg wees nie
equal_to: moet gelyk wees aan %{count}
even: moet gelykstaande wees
exclusion: is bespreek
greater_than: moet meer wees as %{count}
greater_than_or_equal_to: moet meer of gelykstaande wees aan %{count}
inclusion: is nie by die lys ingesluit nie
invalid: is ongeldig
less_than: moet minder wees as %{count}
less_than_or_equal_to: moet minder of gelykstaande wees aan %{count}
not_a_number: is nie n getal nie
not_an_integer: moet n integer wees
odd: moet onewe wees
record_invalid: 'Validation failed: %{errors}'
taken: is reeds geneem
too_long:
one: is te lank (maksimum is 1 karakter)
other: is te lank (maksimum is %{count} karakters)
too_short:
one: is te kort (minimum is 1 karakter)
other: is te kort (minimum is %{count} karakters)
wrong_length:
one: is die verkeerde lengte (moet 1 karakter wees)
other: is die verkeerde lengte (moet %{count} karakters wees)
template:
body: 'There were problems with the following fields:'
header:
one: 1 fout het verhoed dat hierdie %{model} gestoor kon word
other: "%{count} foute het verhoed dat hierdie %{model} gestoor kon word"
helpers:
select:
prompt: Kies asseblief
submit:
create: Skep %{model}
submit: Stoor %{model}
update: Dateer %{model} op
number:
currency:
format:
delimiter: ","
format: "%u%n"
precision: 2
separator: "."
significant: vals
strip_insignificant_zeros: vals
unit: R
format:
delimiter: ","
precision: 3
separator: "."
significant: vals
strip_insignificant_zeros: vals
human:
decimal_units:
format: "%n %u"
units:
billion: miljard
million: miljoen
quadrillion: kwadriljon
thousand: duisend
trillion: biljoen
unit: ''
format:
delimiter: ''
precision: 3
significant: waar
strip_insignificant_zeros: waar
storage_units:
format: "%n %u"
units:
byte:
one: Byte
other: Bytes
gb: GB
kb: KB
mb: MB
tb: TB
percentage:
format:
delimiter: ''
precision:
format:
delimiter: ''
support:
array:
last_word_connector: ", en "
two_words_connector: " en "
words_connector: ", "
time:
am: vm
formats:
default: "%a, %d %b %Y %H:%M:%S %z"
long: "%B %d, %Y %H:%M"
short: "%d %b %H:%M"
pm: nm
Loading

0 comments on commit 186b1ee

Please sign in to comment.