[MNOE-206] Add pricing details to dock settings #82

hedudelgado · 2016-10-14T12:46:52Z

alexnoox · 2016-10-17T03:30:04Z

src/app/views/apps/modals/app-settings-modal.html

+             tooltip-placement="bottom" tooltip="This is the total number of people in your organization using {{app.name}}"></ng-pluralize>
+        </div>
+        <div ng-show="!app.freeTrialEndAt && !app.perUserLicence">Pricing details inside your app</div>
+      </div>


Please use i18n keys.

alexnoox · 2016-10-17T03:49:16Z

src/app/views/apps/modals/app-settings-modal.html

+        <div ng-show="!!app.freeTrialEndAt">
+            Free Trial: {{ app.freeTrialEndAt }}
+        </div>
+        <div ng-show="!app.freeTrialEndAt && app.perUserLicence">


Where are app.freeTrialEndAt and app.perUserLicence defined?
Are they supposed to come from the API? (In this case the variables would be snake cased)

hedudelgado · 2016-10-17T16:49:58Z

Please @alexnoox , have a look at the changes.

Thank you very much for your comments.

alexnoox

LGTM.

@ouranos FYI

alexnoox · 2016-10-17T23:23:55Z

src/app/views/apps/modals/app-settings-modal.coffee

@@ -28,6 +28,7 @@ angular.module 'mnoEnterpriseAngular'
    # ----------------------------------------------------------
    $scope.helper = {}
    $scope.helper.canDeleteApp = ->
+      console.log(app)


Please remove debug logs ;)

hedudelgado · 2016-10-18T08:03:58Z

I cleaned it up @ouranos @alexnoox.

alexnoox · 2016-10-26T06:07:39Z

src/app/views/apps/modals/app-settings-modal.html

+        </div>
+        <div ng-show="!app.free_trial_end_at && app.per_user_licence">
+          <ng-pluralize count="app.licences_count" when="{'0': 'No users', '1': '1 user', 'other': '{{app.licences_count | number}} users'}"
+             tooltip-placement="bottom" tooltip="This is the total number of people in your organization using {{app.name}}"></ng-pluralize>


Please i18n this too.
Ask @clemthenem, he worked on pluralisation and i18n ;)

hedudelgado · 2016-10-27T15:56:32Z

src/app/views/apps/modals/app-settings-modal.html

+            {{ 'mno_enterprise.templates.impac.dock.settings.free_trial' | translate }}: {{ app.free_trial_end_at }}
+        </div>
+        <div ng-show="!app.free_trial_end_at && app.per_user_licence">
+          <ng-pluralize count="app.licences_count" when="{'0': '{{ &quot;mno_enterprise.templates.impac.dock.settings.no_users&quot; | translate }}', '1': '{{ &quot;mno_enterprise.templates.impac.dock.settings.1_user&quot; | translate }}', 'other': '{{app.licences_count | number}} {{ &quot;mno_enterprise.templates.impac.dock.settings.users&quot; | translate }}'}"


Heys @alexnoox , this is the best solution I found to solve the problem of the i18n within the ng-pluralize. I have not checked with @clemthenem as I thought this could be enough. Please confirm this is ok, otherwise I will look for another different or ask clement straight away. In case it works for you, it should be ready to merge. I also added the empty i18n Keys with empty values for different languages for the dock, they were not in the project before.

Thanks!

I would suggest you add the MessageFormat plugin, using the bower command:
bower install angular-translate-interpolation-messageformat

Then add it to your mno-enterprise-angular/src/app/index.config.coffee file:
$translateProvider.addInterpolation('$translateMessageFormatInterpolation');
This means that it will use default ng-translate functionalities and only load this plugin when required.

You can then add this translation in the en.json file:
mno_enterprise.templates.impac.dock.settings.nb_of_users: '{num_users, plural, =0{No users} =1{1 user} other{# users}}';

'num_users' - The name of the variable you are using to test the number

'plural' - The type of action you want to use ( it could also be 'gender' for example)

All the different cases (# is replaced by the variable value in your translation).

Then you can simply use it like this in your template
<p translate="mno_enterprise.templates.impac.dock.settings.nb_of_users" translate-values="{ num_users: app.licences_count }" translate-interpolation="messageformat"></p>

If you wanna play around with it I made this plunkr:
http://plnkr.co/edit/GyrLvacl7rk6GgsH0S6o?p=preview

Let me know if you have any problem.
Here is the doc: https://angular-translate.github.io/docs/#/guide/14_pluralization

hedudelgado · 2017-01-26T11:30:41Z

@alexnoox I have added the solution that @clemthenem suggested. I must thank you by the way Clement, it was pretty clear and straight forward.
Thanks a lot.

Add Intercom backend integration

ouranos

The mnoe API still uses time_ago_in_words. I though we decided to use ISO8601 format and humanise it in the frontend?

ouranos · 2017-02-17T11:18:53Z

bower.json

@@ -23,6 +23,11 @@
    "impac-angular": "~1.5.0-rc1",
    "jquery": "~3.1.0",
    "less": "~2.5.3",
+    "angular-translate": "~2.9.1",


These lines are duplicated

alexnoox

In the id.locale.json and zh.locale.json, you don't need to insert empty locales keys, the framework will automatically fallback to english if the key is not found.

hedudelgado · 2017-02-23T13:41:36Z

@alexnoox updated.

ouranos

@alexnoox could do a final review?

The bower.json is malformed

ouranos · 2017-05-25T05:09:46Z

bower.json

+    "moment": {
+      "main": [
+        "moment.js",
+        "locale/id.js"


Missing a ,

alexnoox

@hedudelgado Could you rebase this PR on master?

Also use angular-moment instead of moment directly.

alexnoox · 2017-05-25T05:15:19Z

bower.json

@@ -46,6 +47,17 @@
        "less/font-awesome.less",
        "./fonts/*"
      ]
+    },
+    "moment": {


Why do you need to do this? We already import angular-moment.

Hey @alexnoox
In angular moment docs:

Usage Include both moment.js and angular-moment.js in your application.

My input
This solution is out of the box and works by loading the different locales files we need in the project from the bower.json. The best part is that we can load all of them, or also only the ones we need. I specified id and ch to avoid having unnecessary extra files, but it can be extended anytime!
"moment": {
"main": [
"moment.js",
"locale/*.js"

Once it is loaded, by passing the locale we are using to moment in the run, or in the select language box for changing it.

moment.locale(TheLocaleWeAreUsing)

The language will be set globally and therefore propagated to every bit in the code where we are binding the result of moment.
The default language is English, it does not need to be loaded.
I tried with Chinese, french and Indonesian and seems to work perfectly fine, so it is very easy to extend.

x4d3 · 2017-09-06T15:33:03Z

@alexnoox @hedudelgado Would it be possible to merge this ?

alexnoox · 2017-09-07T02:00:43Z

@x4d3 No we can't merge this now.

This PR derived from its original goal ([MNOE-206] Add pricing details to dock settings) to i18n and l10n of dates on mno-enterprise-angular. Those features need to be addressed in 2 PRs, especially after the recent work of @ouranos on i18n.

The i18n and l10n solution with angular-moment looks good, it needs to be reworked a bit.

You are using directly using moment (moment.locale($scope.selectedLangKey)) where you sould use the amMoment service (cf. https://github.com/urish/angular-moment#usage).
In the bower file, I don't think we need to load moment.js as it is already loaded. We will need to load the moment locales though.

alexnoox suggested changes Oct 17, 2016

View reviewed changes

alexnoox reviewed Oct 17, 2016

View reviewed changes

hedudelgado force-pushed the pricing branch from 31e663f to 252bc2b Compare October 18, 2016 07:59

hedudelgado force-pushed the pricing branch from 252bc2b to 10a5c50 Compare October 19, 2016 08:53

hedudelgado changed the title ~~Add pricing details to dock settings~~ [MNOE-206] Add pricing details to dock settings Oct 19, 2016

alexnoox suggested changes Oct 26, 2016

View reviewed changes

hedudelgado force-pushed the pricing branch 3 times, most recently from 8abdc07 to 4b509d8 Compare October 27, 2016 15:40

hedudelgado commented Oct 27, 2016

View reviewed changes

ouranos assigned alexnoox and hedudelgado and unassigned alexnoox Nov 10, 2016

MichaelSedov pushed a commit to MichaelSedov/mno-enterprise-angular that referenced this pull request Jan 26, 2017

Merge pull request maestrano#82 from x4d3/feature/intercom

a4366b4

Add Intercom backend integration

alexnoox approved these changes Jan 30, 2017

View reviewed changes

ouranos reviewed Feb 17, 2017

View reviewed changes

alexnoox suggested changes Feb 20, 2017

View reviewed changes

hedudelgado force-pushed the pricing branch 4 times, most recently from e3c6931 to 98527d4 Compare March 10, 2017 18:22

ouranos reviewed May 25, 2017

View reviewed changes

alexnoox reviewed May 25, 2017

View reviewed changes

hedudelgado added 3 commits May 25, 2017 09:40

[MNOE-206] Add pricing details to dock settings

17013e0

[MNOE-206] Add refactoring

4e49f3b

Fix bower.json

09705b9

hedudelgado added 4 commits May 25, 2017 09:40

Remove empty locales values

56aa2d6

Add i18n for dates

f3504df

Add load only ch and id and update anguar-translate

4fe06b9

Fix bower.json

e11b394

hedudelgado force-pushed the pricing branch from 98527d4 to e11b394 Compare May 25, 2017 09:40

ouranos added the enhancement label Jun 15, 2017

ouranos mentioned this pull request Jun 19, 2017

[MNOE-428] Migrate mno-enterprise to MnoHub API V2 maestrano/mno-enterprise#281

Merged

ouranos added the Status: On Hold label Jun 20, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MNOE-206] Add pricing details to dock settings #82

[MNOE-206] Add pricing details to dock settings #82

hedudelgado commented Oct 14, 2016

alexnoox Oct 17, 2016

alexnoox Oct 17, 2016

hedudelgado commented Oct 17, 2016

alexnoox left a comment

alexnoox Oct 17, 2016

hedudelgado commented Oct 18, 2016

alexnoox Oct 26, 2016

hedudelgado Oct 27, 2016 •

edited

Loading

clemoberti Nov 9, 2016 •

edited

Loading

hedudelgado commented Jan 26, 2017

ouranos left a comment

ouranos Feb 17, 2017

alexnoox left a comment

hedudelgado commented Feb 23, 2017

ouranos left a comment

ouranos May 25, 2017

hedudelgado May 25, 2017

alexnoox left a comment

alexnoox May 25, 2017

hedudelgado May 25, 2017

x4d3 commented Sep 6, 2017

alexnoox commented Sep 7, 2017

[MNOE-206] Add pricing details to dock settings #82

Are you sure you want to change the base?

[MNOE-206] Add pricing details to dock settings #82

Conversation

hedudelgado commented Oct 14, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hedudelgado commented Oct 17, 2016

alexnoox left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hedudelgado commented Oct 18, 2016

Choose a reason for hiding this comment

hedudelgado Oct 27, 2016 • edited Loading

Choose a reason for hiding this comment

clemoberti Nov 9, 2016 • edited Loading

Choose a reason for hiding this comment

hedudelgado commented Jan 26, 2017

ouranos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexnoox left a comment

Choose a reason for hiding this comment

hedudelgado commented Feb 23, 2017

ouranos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexnoox left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

x4d3 commented Sep 6, 2017

alexnoox commented Sep 7, 2017

hedudelgado Oct 27, 2016 •

edited

Loading

clemoberti Nov 9, 2016 •

edited

Loading