1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00

Allow removing contacts from the about page + defaut locales

This commit is contained in:
Sylvain 2020-04-08 16:32:22 +02:00
parent 5f6c293046
commit 92398c6d8d
4 changed files with 11 additions and 7 deletions

View File

@ -6,6 +6,7 @@
- Compatible database with Fab-manager v1, to allow upgrades
- Updated documentation
- Changed In-Context pseudo-language to Zulu instead of Acholi
- Allow removing contacts from the about page
- Fix a bug: installation without nginx does not remove the service from the docker-compose file
- Fix a bug: default twitter feed is invalid
- Fix a bug: default nginx configuration does not allows secure cookies

View File

@ -8,7 +8,8 @@
</div>
<div class="row padder">
<div class="col-sm-offset-1 col-md-offset-3 col-sm-7 col-md-5 col-lg-4 m-b-lg">
<div ng-class="{'col-sm-10 col-md-6 col-lg-6':!aboutContacts.value, 'col-sm-7 col-md-5 col-lg-4':aboutContacts.value}"
class="col-sm-offset-1 col-md-offset-3 col-sm-7 col-md-5 col-lg-4 m-b-lg">
<span ng-bind-html="aboutBody.value"></span>
<p ng-show="cgu">
<a href="{{cgu.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ 'app.public.about.read_the_fablab_policy' }}</a>
@ -21,7 +22,7 @@
</p>
</div>
<div class="col-sm-offset-0 col-md-offset-0 col-lg-offset-1 col-sm-4 col-md-4">
<div class="col-sm-offset-0 col-md-offset-0 col-lg-offset-1 col-sm-4 col-md-4" ng-show="aboutContacts.value">
<h2 class="about-title-aside text-u-c" translate>{{ 'app.public.about.your_fablab_s_contacts' }}</h2>
<span ng-bind-html="aboutContacts.value"></span>
</div>

View File

@ -1,5 +0,0 @@
# frozen_string_literal: true
# we allow the Zulu locale (zu) as it is used for In-Context translation
# @see https://support.crowdin.com/in-context-localization/
I18n.config.available_locales = :zu

View File

@ -0,0 +1,7 @@
# frozen_string_literal: true
# List of all allowed values for RAILS_LOCALE
I18n.config.available_locales += %i[en en-AU-CA en-GB en-IE en-IN en-NZ en-US en-ZA fr fa-CA fr-CH fr-CM fr-FR es es-419
es-AR es-CL es-CO es-CR es-DO es-EC es-ES es-MX es-PA es-PE es-US es-VE pt pt-BR zu]
# we allow the Zulu locale (zu) as it is used for In-Context translation
# @see https://support.crowdin.com/in-context-localization/