From 774eb41cf7d7b265d23e9c58d244ea698ae1cb1c Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Tue, 18 Sep 2018 16:36:14 +0200 Subject: [PATCH 01/29] translation files and menu --- .../change_password_content.html.twig | 2 +- .../views/Registration/check_email.html.twig | 1 - .../views/Registration/confirmed.html.twig | 1 - .../views/Registration/email.txt.twig | 1 - .../Registration/register_content.html.twig | 1 - .../views/Resetting/request.html.twig | 1 - .../views/Security/login.html.twig | 1 - .../views/Security/login_content.html.twig | 2 -- .../FOSUserBundle/views/layout.html.twig | 1 - .../views/Connect/login.html.twig | 1 - .../HWIOAuthBundle/views/layout.html.twig | 1 - app/Resources/views/default/index.html.twig | 2 -- .../views/default/login-choices.html.twig | 28 +++++++++++-------- .../views/logged/dashboard.html.twig | 1 - app/Resources/views/logged/history.html.twig | 1 - app/Resources/views/logged/import.html.twig | 1 - .../views/logged/previsionnel.html.twig | 1 - ...serBundle.fr.yml => FOSUserBundle.fr.yml~} | 1 + translations/messages.en.yml | 15 ++++++++++ translations/{de => messages.en.yml~} | 0 translations/messages.fr.yaml | 15 ++++++++++ translations/{en => messages.fr.yml~} | 2 +- 22 files changed, 49 insertions(+), 31 deletions(-) rename translations/{FOSUserBundle.fr.yml => FOSUserBundle.fr.yml~} (69%) mode change 100755 => 100644 create mode 100644 translations/messages.en.yml rename translations/{de => messages.en.yml~} (100%) mode change 100755 => 100644 create mode 100755 translations/messages.fr.yaml rename translations/{en => messages.fr.yml~} (63%) mode change 100755 => 100644 diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig index 6c3d0cc1..dcce969a 100755 --- a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig +++ b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'FOSUserBundle' %} + {{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }} {{ form_widget(form) }} diff --git a/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig b/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig index 41af21de..3d64ae20 100755 --- a/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig +++ b/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig @@ -1,6 +1,5 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}

{{ 'registration.check_email'|trans({'%email%': user.email}) }}

diff --git a/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig b/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig index 4402b4f7..a06915c7 100755 --- a/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig +++ b/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig @@ -1,6 +1,5 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}

{{ 'registration.confirmed'|trans({'%username%': user.username}) }}

diff --git a/app/Resources/FOSUserBundle/views/Registration/email.txt.twig b/app/Resources/FOSUserBundle/views/Registration/email.txt.twig index acbc6852..d853b6d3 100755 --- a/app/Resources/FOSUserBundle/views/Registration/email.txt.twig +++ b/app/Resources/FOSUserBundle/views/Registration/email.txt.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {% block subject %} {%- autoescape false -%} {{ 'registration.email.subject'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}) }} diff --git a/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig b/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig index f05eac7b..0245476b 100755 --- a/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} {{ form_widget(form) }} diff --git a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig index 36b93037..97d0f4e7 100755 --- a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig +++ b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig @@ -1,5 +1,4 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}
diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig index a55b2b29..784de4b6 100755 --- a/app/Resources/FOSUserBundle/views/Security/login.html.twig +++ b/app/Resources/FOSUserBundle/views/Security/login.html.twig @@ -1,5 +1,4 @@ {% extends "@FOSUser/layout.html.twig" %} -{% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %}
diff --git a/app/Resources/FOSUserBundle/views/Security/login_content.html.twig b/app/Resources/FOSUserBundle/views/Security/login_content.html.twig index 6daf8b92..8b149f3a 100755 --- a/app/Resources/FOSUserBundle/views/Security/login_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Security/login_content.html.twig @@ -1,5 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} - {% if error %}
{{ error.messageKey|trans(error.messageData, 'security') }}
{% endif %} diff --git a/app/Resources/FOSUserBundle/views/layout.html.twig b/app/Resources/FOSUserBundle/views/layout.html.twig index 40c44d0e..2731764c 100755 --- a/app/Resources/FOSUserBundle/views/layout.html.twig +++ b/app/Resources/FOSUserBundle/views/layout.html.twig @@ -1,5 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} {% block title %}Caisse{% endblock %} {% block bigMain %} diff --git a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig index aea1b572..03a26456 100755 --- a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig +++ b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {% extends '@HWIOAuth/layout.html.twig' %} {% block bigMain %} {% include 'default/header.html.twig' %} diff --git a/app/Resources/HWIOAuthBundle/views/layout.html.twig b/app/Resources/HWIOAuthBundle/views/layout.html.twig index 7cefaf9b..7cbdf755 100755 --- a/app/Resources/HWIOAuthBundle/views/layout.html.twig +++ b/app/Resources/HWIOAuthBundle/views/layout.html.twig @@ -5,7 +5,6 @@

Le login

- {% trans_default_domain 'FOSUserBundle' %} {% if error %}
{{ error|trans }}
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index 12adaf8d..1edc80cb 100755 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -1,6 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} - {% block bigMain %} {% include 'default/main-screen.html.twig' %} diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig index dfbe9481..54ac48e4 100755 --- a/app/Resources/views/default/login-choices.html.twig +++ b/app/Resources/views/default/login-choices.html.twig @@ -1,4 +1,3 @@ -{% trans_default_domain 'FOSUserBundle' %} {% block loginchoices %}
@@ -12,7 +11,8 @@
  • - Caisse Bliss + + {% trans %}menu.title{% endtrans %}
  • @@ -22,7 +22,7 @@ btn-default {% endif %}" href="{{ path('dashboard') }}"> - Dashboard + {% trans %}menu.dashboard{% endtrans %}
  • @@ -33,8 +33,7 @@ {% endif %} " href="{{ path('productcategory_index') }}"> - Catégories - + {% trans %}menu.categories{% endtrans %} {{ app.user.categories|length }} @@ -49,7 +48,7 @@ href="{{ path('product_index') }}" > - Produits + {% trans %}menu.products{% endtrans %} {{ app.user.products|length }} @@ -64,7 +63,8 @@ " href='{{ path('festival_index') }}' > - Festivals + + {% trans %}menu.festivals{% endtrans %} {{ app.user.festivals|length }} @@ -78,7 +78,7 @@ {% endif %}" href="{{ path('history') }}" > - Historique + {% trans %}menu.history{% endtrans %}
  • @@ -90,7 +90,8 @@ {% endif %}" href="{{ path('import') }}" > - Import + + {% trans %}menu.import{% endtrans %}
  • @@ -102,14 +103,16 @@ {% endif %}" href="{{ path('previsionnel') }}" > - Prévisionnel + + {% trans %}menu.future{% endtrans %}
    • - Bonjour + + {% trans %}user.greet{% endtrans %} @@ -118,7 +121,8 @@ | - Déconnexion + + {% trans %}layout.logout{% endtrans %}
    diff --git a/app/Resources/views/logged/dashboard.html.twig b/app/Resources/views/logged/dashboard.html.twig index d98e4d33..79dca5cd 100755 --- a/app/Resources/views/logged/dashboard.html.twig +++ b/app/Resources/views/logged/dashboard.html.twig @@ -1,5 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} {% block body %}
    diff --git a/app/Resources/views/logged/history.html.twig b/app/Resources/views/logged/history.html.twig index c129a839..349b7679 100755 --- a/app/Resources/views/logged/history.html.twig +++ b/app/Resources/views/logged/history.html.twig @@ -1,5 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} {% block body %}
    diff --git a/app/Resources/views/logged/import.html.twig b/app/Resources/views/logged/import.html.twig index 0456c844..f7df3341 100755 --- a/app/Resources/views/logged/import.html.twig +++ b/app/Resources/views/logged/import.html.twig @@ -1,5 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} {% block body %}

    Importation, création en masse

    diff --git a/app/Resources/views/logged/previsionnel.html.twig b/app/Resources/views/logged/previsionnel.html.twig index 2f5e3ada..86ad94a8 100755 --- a/app/Resources/views/logged/previsionnel.html.twig +++ b/app/Resources/views/logged/previsionnel.html.twig @@ -1,5 +1,4 @@ {% extends 'base.html.twig' %} -{% trans_default_domain 'FOSUserBundle' %} {% block body %} {% verbatim %} diff --git a/translations/FOSUserBundle.fr.yml b/translations/FOSUserBundle.fr.yml~ old mode 100755 new mode 100644 similarity index 69% rename from translations/FOSUserBundle.fr.yml rename to translations/FOSUserBundle.fr.yml~ index 6c41d085..69a9bdc8 --- a/translations/FOSUserBundle.fr.yml +++ b/translations/FOSUserBundle.fr.yml~ @@ -1,2 +1,3 @@ layout.logout: __layout.logout layout.register: __layout.register +layout.login: __layout.login diff --git a/translations/messages.en.yml b/translations/messages.en.yml new file mode 100644 index 00000000..53c319e7 --- /dev/null +++ b/translations/messages.en.yml @@ -0,0 +1,15 @@ +layout.login: login +layout.logout: logout +layout.register: subscribe +'Symfony is great': 'J''aime Symfony' +menu: + title: Caisse Bliss + dashboard: Dashboard + history: History + import: Import + festival: Festivals + products: Products + categories: Categories + future: Forecast +user: + greet: Hi \ No newline at end of file diff --git a/translations/de b/translations/messages.en.yml~ old mode 100755 new mode 100644 similarity index 100% rename from translations/de rename to translations/messages.en.yml~ diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml new file mode 100755 index 00000000..fc45745c --- /dev/null +++ b/translations/messages.fr.yaml @@ -0,0 +1,15 @@ +layout.login: Connexion +layout.logout: Déconnexion +layout.register: Inscription +'Symfony is great': 'J''aime Symfony' +menu: + title: Caisse Bliss + dashboard: Dashboard + history: Historique + import: Importer + festival: Festivals + products: Produits + categories: Catégories + future: Prévisionnel +user: + greet: Bonjour \ No newline at end of file diff --git a/translations/en b/translations/messages.fr.yml~ old mode 100755 new mode 100644 similarity index 63% rename from translations/en rename to translations/messages.fr.yml~ index 63781b66..a881579d --- a/translations/en +++ b/translations/messages.fr.yml~ @@ -1,3 +1,3 @@ ---- layout.logout: __layout.logout layout.register: __layout.register +'Symfony is great': 'J''aime Symfony' From 3c5b7b672e5fa5645226d124bcb82509aec06956 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Tue, 18 Sep 2018 16:47:58 +0200 Subject: [PATCH 02/29] login translate --- .../views/Security/login.html.twig | 66 ++++++++++--------- translations/messages.en.yml | 19 ++++-- .../{messages.fr.yaml => messages.fr.yml} | 10 ++- 3 files changed, 56 insertions(+), 39 deletions(-) rename translations/{messages.fr.yaml => messages.fr.yml} (61%) diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig index 784de4b6..f06bbb7b 100755 --- a/app/Resources/FOSUserBundle/views/Security/login.html.twig +++ b/app/Resources/FOSUserBundle/views/Security/login.html.twig @@ -8,37 +8,6 @@ Se connecter - {% if error %} -
    {{ error.messageKey|trans(error.messageData, 'security') }}
    - {% endif %} - -
    - {% if csrf_token %} - - {% endif %} -
    - - - -
    -
    - - - - -
    -
    - - - - -
    - - -
    category-listing -
    @@ -60,7 +29,42 @@
    +
    +
    +
    + + {% if error %} +
    {{ error.messageKey|trans(error.messageData, 'security') }}
    + {% endif %} + +
    + {% if csrf_token %} + + {% endif %} +
    + + + +
    +
    + + + + +
    +
    + + +
    + + +
    +
    +
    +
    {% endblock %} diff --git a/translations/messages.en.yml b/translations/messages.en.yml index 53c319e7..8e44dc87 100644 --- a/translations/messages.en.yml +++ b/translations/messages.en.yml @@ -1,15 +1,22 @@ -layout.login: login -layout.logout: logout -layout.register: subscribe -'Symfony is great': 'J''aime Symfony' +layout: + login: login + logout: logout + register: subscribe menu: title: Caisse Bliss dashboard: Dashboard history: History import: Import - festival: Festivals + festivals: Festivals products: Products categories: Categories future: Forecast user: - greet: Hi \ No newline at end of file + greet: Hi +security: + login: + username: utilisateur + password: mot de passe + remember_me: se souvenir + submit: envoyer +'Symfony is great': 'J''aime Symfony' diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yml similarity index 61% rename from translations/messages.fr.yaml rename to translations/messages.fr.yml index fc45745c..162eb003 100755 --- a/translations/messages.fr.yaml +++ b/translations/messages.fr.yml @@ -7,9 +7,15 @@ menu: dashboard: Dashboard history: Historique import: Importer - festival: Festivals + festivals: Festivals products: Produits categories: Catégories future: Prévisionnel user: - greet: Bonjour \ No newline at end of file + greet: Bonjour +security: + login: + username: utilisateur + password: mot de passe + remember_me: se souvenir + submit: envoyer \ No newline at end of file From 741f0c3b1e47b41d5311b20ed62b2afa1b3d6795 Mon Sep 17 00:00:00 2001 From: ty kayn Date: Wed, 19 Sep 2018 17:37:00 +0200 Subject: [PATCH 03/29] Add LICENSE AGPL --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..54cad125 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + caisse-bliss + Copyright (C) 2018 ty kayn + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From c9646176b031cdede6d7ba787c3263a5ee32cffb Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Thu, 20 Sep 2018 11:37:29 +0200 Subject: [PATCH 04/29] :book: add translation key pairs in fr and english --- translations/FOSUserBundle.fr.yml~ | 3 - translations/messages.en.yml | 144 ++++++++++++++++++++++++++- translations/messages.en.yml~ | 3 - translations/messages.fr.yml | 154 +++++++++++++++++++++++++++-- translations/messages.fr.yml~ | 3 - web/config.php | 0 6 files changed, 291 insertions(+), 16 deletions(-) delete mode 100644 translations/FOSUserBundle.fr.yml~ mode change 100644 => 100755 translations/messages.en.yml delete mode 100644 translations/messages.en.yml~ delete mode 100644 translations/messages.fr.yml~ mode change 100644 => 100755 web/config.php diff --git a/translations/FOSUserBundle.fr.yml~ b/translations/FOSUserBundle.fr.yml~ deleted file mode 100644 index 69a9bdc8..00000000 --- a/translations/FOSUserBundle.fr.yml~ +++ /dev/null @@ -1,3 +0,0 @@ -layout.logout: __layout.logout -layout.register: __layout.register -layout.login: __layout.login diff --git a/translations/messages.en.yml b/translations/messages.en.yml old mode 100644 new mode 100755 index 8e44dc87..6f55d96e --- a/translations/messages.en.yml +++ b/translations/messages.en.yml @@ -19,4 +19,146 @@ security: password: mot de passe remember_me: se souvenir submit: envoyer -'Symfony is great': 'J''aime Symfony' + home: + main_description: "Votre caisse mobile dynamique en ligne Pensé pour les exposants et les créateurs divers en festival, cette caisse saura s'adapter à l'évolution de vos stocks et vous libèrera des affres de la fiche de compte à faire et compléter soi même." + try: Essayer dès maintenant + demo_hint: "Démonstration en vous connectant avec le login: demo et le mot de passe demo." + specs: + free: Gratuit + free_text: "Gérez votre comptabilité de stand en ligne sans dépenser un rond. Plus besoin de transporter un inventaire et des feuilles de calcul faites à l'arrache." + flex: Flexible + flex_text: "Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de responsable en cours de journée. Créez plusieurs produits juste en écrivant leur nom avec l'interface d'importation simplifiée." + portable: Portable + portable_text: "Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que simplifiée." + open: Open Source + open_text: "Auto hébergeable et modifiable à volonté. Sources disponible sur gitlab. Développé par CipherBliss." + stats: Statistiques + stats_text: "Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes." + data: Data Love + data_text: "Données exportables et importables en masse librement." + contact: + hint: contactez-moi pour tout renseignement + email: par email + telegram: Telegram @Tykayn + social: ou sur Mastodon + dashboard: + options: + express: "mode vente express" + express_text: "la vente express vous permet d'enregistrer une vente pour un seul article sans remplir le formulaire de détail" + stocks: stocks + sold: vendus + customer: Client actuel + customer_default_name: un gens + products: produits + visibility: Visibilité des catégories + total: Total + festival: Festival + global: + made_by: développé par + categ: Catégorie de produit + categ_new: Nouvelle catégorie + products: Produits + products_hint: "astuce: Utilisez l'import de masse pour créer plusieurs produits et catégories à la fois" + products_new: Nouveau produit + festivals: Festivals + current: Actuel + wip: Fonctionnalité en cours de création + category: + name: Nom + products: Produits + sold: Vendus + actions: Actions + products: + category: Category + name: Name + image: Image + price: Price + stocks: Stocks + comment: Comment + actions: Actions + festivals: + name: Name + creation: Datecreation + costs: Tous Frais + customers: Clients + before: fond caisse avant + after: fond caisse apres + ca: chiffre affaire + stock: fond caisse + CA + diff: diff + benef: bénefices CA - frais + actions: Actions + history: + title: Historique + export: Exporter toutes vos données en format csv + sold: + customers: Clients + ca: Chiffre d'affaires + cart: panier moyen + stats: Statistiques de ventes + last: Dernières ventes + sellings: + date: date + comm: commentaire + products: produits + amount: montant + import: + title: Importation, création en masse + create: Création de produits en masse + create_text: Créez vos produits et leur catégorie en masse, un par ligne + validate: Créer en masse + import: Importer votre historique de ventes + import_step_1: Télécharger le fichier de modèle + import_step_2: Remplir votre modèle avec vos ventes + import_step_3: à faire + forecast: + title: Prévisionnel + saving: Sauvegarde en cours + saved: Modifications sauvegardées + conf: Configuration + start: Euros disponibles au départ + month_earnings: Gains moyen par mois + delay: Gérer délais de paiement + repeat: Gérer répétitions + monthly: Dépenses mensuelles + benef: Bénef mensuel + credit: "Crédit mensuel réalisable (33%% des gains moyens par mois)" + posts_title: Postes de dépenses mensuelles + posts_text: "Indiquez les catégories de dépenses mensuelles que vous faites pour faire évoluer la simulation de budget restant dans plusieurs mois." + simulation: "Simulation sur % mois" + table: + warning_text: Ce sera la dèche dans % mois + months: Month in the future + date: date + expenses: Dépenses + availability: Disponibilité + columns: + name: Nom + monthly: prix mensuel + yearly: prix annuel + enabled: activé + example: + title: Exemples de postes de dépenses à ajouter + content: "appartement + mutuelle + transport en commun + assurance voiture + assurance moto + trucs de loisirs divers + gaz + elec + internet + épargne + impots + cottisation URSSAF + resto au boulot + courses + serveur wouaibe + abonnement protonmail VPN + abonnement service audio, vidéo + carburant véhicule + donations + médecin + chat + chien + licorne " \ No newline at end of file diff --git a/translations/messages.en.yml~ b/translations/messages.en.yml~ deleted file mode 100644 index 63781b66..00000000 --- a/translations/messages.en.yml~ +++ /dev/null @@ -1,3 +0,0 @@ ---- -layout.logout: __layout.logout -layout.register: __layout.register diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml index 162eb003..49b56481 100755 --- a/translations/messages.fr.yml +++ b/translations/messages.fr.yml @@ -1,7 +1,6 @@ layout.login: Connexion layout.logout: Déconnexion layout.register: Inscription -'Symfony is great': 'J''aime Symfony' menu: title: Caisse Bliss dashboard: Dashboard @@ -14,8 +13,151 @@ menu: user: greet: Bonjour security: - login: - username: utilisateur - password: mot de passe - remember_me: se souvenir - submit: envoyer \ No newline at end of file + login: + username: utilisateur + password: mot de passe + remember_me: se souvenir + submit: envoyer +home: + main_description: "Votre caisse mobile dynamique en ligne Pensé pour les exposants et les créateurs divers en festival, cette caisse saura s'adapter à l'évolution de vos stocks et vous libèrera des affres de la fiche de compte à faire et compléter soi même." + try: Essayer dès maintenant + demo_hint: "Démonstration en vous connectant avec le login: demo et le mot de passe demo." + specs: + free: Gratuit + free_text: "Gérez votre comptabilité de stand en ligne sans dépenser un rond. Plus besoin de transporter un inventaire et des feuilles de calcul faites à l'arrache." + flex: Flexible + flex_text: "Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de responsable en cours de journée. Créez plusieurs produits juste en écrivant leur nom avec l'interface d'importation simplifiée." + portable: Portable + portable_text: "Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que simplifiée." + open: Open Source + open_text: "Auto hébergeable et modifiable à volonté. Sources disponible sur gitlab. Développé par CipherBliss." + stats: Statistiques + stats_text: "Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes." + data: Data Love + data_text: "Données exportables et importables en masse librement." + contact: + hint: contactez-moi pour tout renseignement + email: par email + telegram: Telegram @Tykayn + social: ou sur Mastodon +dashboard: + options: + express: "mode vente express" + express_text: "la vente express vous permet d'enregistrer une vente pour un seul article sans remplir le formulaire de détail" + stocks: stocks + sold: vendus + customer: Client actuel + customer_default_name: un gens + products: produits + visibility: Visibilité des catégories + total: Total + festival: Festival +global: + made_by: développé par + categ: Catégorie de produit + categ_new: Nouvelle catégorie + products: Produits + products_hint: "astuce: Utilisez l'import de masse pour créer plusieurs produits et catégories à la fois" + products_new: Nouveau produit + festivals: Festivals + current: Actuel + wip: Fonctionnalité en cours de création +category: + name: Nom + products: Produits + sold: Vendus + actions: Actions +products: + category: Category + name: Name + image: Image + price: Price + stocks: Stocks + comment: Comment + actions: Actions +festivals: + name: Name + creation: Datecreation + costs: Tous Frais + customers: Clients + before: fond caisse avant + after: fond caisse apres + ca: chiffre affaire + stock: fond caisse + CA + diff: diff + benef: bénefices CA - frais + actions: Actions +history: + title: Historique + export: Exporter toutes vos données en format csv + sold: + customers: Clients + ca: Chiffre d'affaires + cart: panier moyen + stats: Statistiques de ventes + last: Dernières ventes +sellings: + date: date + comm: commentaire + products: produits + amount: montant +import: + title: Importation, création en masse + create: Création de produits en masse + create_text: Créez vos produits et leur catégorie en masse, un par ligne + validate: Créer en masse + import: Importer votre historique de ventes + import_step_1: Télécharger le fichier de modèle + import_step_2: Remplir votre modèle avec vos ventes + import_step_3: à faire +forecast: + title: Prévisionnel + saving: Sauvegarde en cours + saved: Modifications sauvegardées + conf: Configuration + start: Euros disponibles au départ + month_earnings: Gains moyen par mois + delay: Gérer délais de paiement + repeat: Gérer répétitions + monthly: Dépenses mensuelles + benef: Bénef mensuel + credit: Crédit mensuel réalisable (33% des gains moyens par mois) + posts_title: Postes de dépenses mensuelles + posts_text: "Indiquez les catégories de dépenses mensuelles que vous faites pour faire évoluer la simulation de budget restant dans plusieurs mois." + simulation: "Simulation sur % mois" + table: + warning_text: Ce sera la dèche dans % mois + months: Month in the future + date: date + expenses: Dépenses + availability: Disponibilité + columns: + name: Nom + monthly: prix mensuel + yearly: prix annuel + enabled: activé + example: + title: Exemples de postes de dépenses à ajouter + content: "appartement + mutuelle + transport en commun + assurance voiture + assurance moto + trucs de loisirs divers + gaz + elec + internet + épargne + impots + cottisation URSSAF + resto au boulot + courses + serveur wouaibe + abonnement protonmail VPN + abonnement service audio, vidéo + carburant véhicule + donations + médecin + chat + chien + licorne " diff --git a/translations/messages.fr.yml~ b/translations/messages.fr.yml~ deleted file mode 100644 index a881579d..00000000 --- a/translations/messages.fr.yml~ +++ /dev/null @@ -1,3 +0,0 @@ -layout.logout: __layout.logout -layout.register: __layout.register -'Symfony is great': 'J''aime Symfony' diff --git a/web/config.php b/web/config.php old mode 100644 new mode 100755 From 986eef7b991959bbc01f065e472358b65b4f2ff3 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Mon, 1 Oct 2018 16:51:52 +0200 Subject: [PATCH 05/29] [I18N] :book: added translations for en, fr, and keys for the homepage. :art: style --- .../views/default/description-app.html.twig | 54 ++-- app/Resources/views/default/footer.html.twig | 3 +- .../views/default/main-screen.html.twig | 57 ++-- translations/messages.en.yml | 274 ++++++++---------- 4 files changed, 180 insertions(+), 208 deletions(-) diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig index 46df9446..0e64a6c5 100755 --- a/app/Resources/views/default/description-app.html.twig +++ b/app/Resources/views/default/description-app.html.twig @@ -1,46 +1,48 @@
    -
    +
    -

    Gratuit

    -

    Gérez votre comptabilité de stand en ligne sans dépenser un rond. Plus besoin de transporter un - inventaire et des feuilles de calcul faites à l'arrache.

    +

    {% trans %}home.specs.free{% endtrans %}

    +

    {% trans %}home.specs.free_text{% endtrans %}

    -
    +
    -

    Flexible

    -

    Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de - responsable en cours de journée. Créez plusieurs produits juste en écrivant leur nom avec l'interface - d'importation simplifiée.

    +

    {% trans %}home.specs.flex{% endtrans %}

    +

    {% trans %}home.specs.flex_text{% endtrans %}

    -
    +
    -

    Portable

    -

    Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que - simplifiée.

    +

    {% trans %}home.specs.portable{% endtrans %}

    +

    {% trans %}home.specs.portable_text{% endtrans %}

    -
    +
    -

    Open Source

    -

    Auto hébergeable et modifiable à volonté. Sources disponible sur - gitlab. - Développé par - CipherBliss - . +

    {% trans %}home.specs.open{% endtrans %}

    +

    {% trans %}home.specs.open_text{% endtrans %} +

    -
    +
    -

    Statistiques

    -

    Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes.

    +

    {% trans %}home.specs.stats_text{% endtrans %}

    +

    + {% trans %}home.specs.stats_text{% endtrans %} +

    -
    +
    -

    Data Love

    -

    Données exportables et importables en masse librement.

    +

    {% trans %}home.specs.data{% endtrans %}

    +

    {% trans %}home.specs.data_text{% endtrans %}

    diff --git a/app/Resources/views/default/footer.html.twig b/app/Resources/views/default/footer.html.twig index 31217888..cb8a254a 100755 --- a/app/Resources/views/default/footer.html.twig +++ b/app/Resources/views/default/footer.html.twig @@ -1,6 +1,7 @@