Add answer poll counts

[Flaburgan]

'cause my head doesn't want to calculate it anymore.

[Flaburgan]

zero doesn't work. How to do that?

[jhass]

The english pluralization rule doesn't make use of zero. And 0 votes is in fact the correct English.

[Flaburgan]

But it will still be presented to translators in webtranslateit automatically right?
Good then, I'll revert that.

[jhass]

Yes.

[jaywink]

Nice 👍

[guil-herm-e]

👍

[Flaburgan]

I need a little help with the failing Jasmine test. The line expect(this.view.$('.poll_progress_bar_wrapper:first').css('display')).toBe("none"); is failing now on Travis but is green locally. This PR changes the markup removing style="display: none;" and adding it to the CSS file. Looks like .css('display') on Travis isn't able to get the result from the CSS file. Any idea?

[svbergerem]

Add the rendered element to the spec content and test the visibility there:

diff --git a/spec/javascripts/app/views/poll_view_spec.js b/spec/javascripts/app/views/poll_view_spec.js
index 0b9b7d5..bbd4551 100644
--- a/spec/javascripts/app/views/poll_view_spec.js
+++ b/spec/javascripts/app/views/poll_view_spec.js
@@ -2,7 +2,7 @@ describe("app.views.Poll", function(){
   beforeEach(function() {
     loginAs({name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}});
     this.view = new app.views.Poll({ model: factory.postWithPoll()});
-    this.view.render();
+    spec.content().html(this.view.render().el);
   });

   describe("setProgressBar", function(){
@@ -15,9 +15,9 @@ describe("app.views.Poll", function(){

   describe("toggleResult", function(){
     it("toggles the progress bar and result", function(){
-      expect(this.view.$('.poll_progress_bar_wrapper:first').css('display')).toBe("none");
-      this.view.toggleResult(null);
-      expect(this.view.$('.poll_progress_bar_wrapper:first').css('display')).toBe("block");
+      expect($(".poll_progress_bar_wrapper:first")).toBeHidden();
+      this.view.toggleResult();
+      expect($(".poll_progress_bar_wrapper:first")).toBeVisible();
     });
   });

You can run the jasmine tests locally with

bin/rake jasmine:ci

instead of running them in the browser. Travis is doing the same thing.

[diaspora-code-review]

Strings must use doublequote.

[diaspora-code-review]

Properties should be ordered font-weight, margin-bottom, vertical-align

[Flaburgan]

I still have a bug here, looks like the "0" case is using the "one" translation. Any idea what's going on?

[svbergerem]

Other translations in that file look like this:

reshares:
  zero: "<%= count %> Reshares"
  one: "<%= count %> Reshare"
  other: "<%= count %> Reshares"

I'm not familiar with our translation code but I'd try to do the same here.

[Flaburgan]

@jhass told me a few days ago that zero was not needed for english and the "count" translation just above doesn't have it and works well, so really no idea where the problem is.

[Flaburgan]

My bad, the bug was there because the local was set to french, which needs a zero key. So, no bug.

[SuperTux88]

maybe you should add zero to the english translation, even if english doesn't need it, but other languages use this key as fallback.

[Flaburgan]

@SuperTux88 I did that first but then removed it following @jhass advice. Jonne what should we do here? (even if this doesn't block this PR so is maybe a out of topic discussion).

[denschub]

Add zero.

[Flaburgan]

Ok, should be ready to merge ;)

[svbergerem]

Seems legit. Thank you!