Merge pull request #331 from snap-cloud/reg-pluralize-bugfix

Two Minor Bugfixes
snap-cloud · Jul 18, 2023 · b480c7c · b480c7c
2 parents 1d13597 + de69156
commit b480c7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
@@ -15,7 +15,7 @@ def create
       @ticket_scanning.save
       dest_path = conferences_path
       if request.referer&.match?(%r{admin/conferences})
-        dest_path = admin_conference_physical_tickets_path(@conference)
+        dest_path = admin_conference_physical_tickets_path(conference_id: @conference.short_title)
       end
       redirect_to dest_path,
                   notice: "Ticket with token #{@physical_ticket.token} successfully scanned."

diff --git a/app/helpers/format_helper.rb b/app/helpers/format_helper.rb
@@ -111,7 +111,7 @@ def class_for_todo(bool)
   end
 
   def word_pluralize(count, singular, plural = nil)
-    if count == 1 || count =~ /^1(\.0+)?$/
+    if count.positive? && count < 2
       singular
     else
       plural || singular.pluralize