_includes/recipes.html

@@ -5,8 +5,11 @@
 		<p>
 			By {{ recipe.author }} -
 			{% if recipe.difficulty %}Difficulty: <span class='stars'>{{ recipe.difficulty | to_stars }}</span> - {%- endif %}
-			{{ recipe.method | size }} steps
+			{{ recipe.method | size }} steps {%- if recipe.time %} -
-			{%- if recipe.time %} - {{ recipe.time | hours_and_minutes: false }}{%- endif -%}
+			{%- if recipe.time > 59 %} {{ recipe.time | divided_by: 60}}h {% endif -%}
+			{% assign mins = recipe.time | modulo: 60 -%}
+			{%- if mins > 0 %}{{ mins }}m{% endif %}
+			{%- endif -%}
 		</p>
 		<ol class='excerpt'>
 			{% for step in recipe.method | limit: 4 %}

_layouts/recipe.html

@@ -17,7 +17,18 @@ custom_h1: true
 <h1 class='scrolling'>{{ page.name }}</h1>
 <h1 class='invisible'>{{ page.name }}</h1>
 {%- if page.time -%}
-	{%- assign time = page.time | hours_and_minutes -%}
+	{%- if page.time > 59 %}
+		{%- assign hours = page.time | divided_by: 60 -%}
+		{%- assign minutes = page.time | modulo: 60 -%}
+		{%- assign time = hours | append: " hour" -%}
+		{%- if hours > 1 %}{% assign time = time | append: "s" %}{% endif -%}
+		{%- if minutes > 0 -%}
+			{%- assign time = time | append: " " | append: minutes | append: " minute" -%}
+			{%- if minutes > 1 %}{% assign time = time | append: "s" %}{% endif -%}
+		{%- endif -%}
+	{%- else -%}
+		{%- assign time = page.time %}
+	{%- endif -%}
 {%- endif -%}
 
 <p class='subtle'>{% if page.difficulty %}Difficulty: <span class='stars'>{{ page.difficulty | to_stars }}</span> - {% endif %}{{ page.method.size }} steps - Estimated cooking time: {{ time | default: "Not provided" }} {% if page.author %} - By {{ page.author }} {% endif %}</p>

_plugins/custom_stuff.rb

@@ -57,25 +57,6 @@ module Jekyll
 
 			out
 		end
-
-		def hours_and_minutes(input, long = true)
-			time = input.to_i.divmod(60)
-			hours, minutes = "h", "m"
-			if long
-				hours = " hour" + (time[0] > 1 ? "s" : "") + " "
-				minutes = " minute" + (time[1] > 1 ? "s" : "") + " "
-			end
-
-			out = ["#{time[0]}#{hours}", "#{time[1]}#{minutes}"]
-
-			if time[1] == 0
-				out[0]
-			elsif time[0] == 0
-				out[1]
-			else
-				out.join("")
-			end
-		end
 	end
 end