Commit 5ea3c053 authored by Ekta Nandwani's avatar Ekta Nandwani

Merge branch 'master' of gitlab.gnome.org:ekta/recipes

parents 93faae0f 8afa2a5e
Pipeline #4562 passed with stage
in 3 minutes and 45 seconds
......@@ -49,26 +49,25 @@ Canned chopped tomatoes
Carrot
Cashews, lightly toasted
Caster sugar
celery
Celey
Celery
Champignons
Cheese
Cheese slices
Cherries, pitted
cherry tomatoes, halved
Cherry tomatoes, halved
Chia seeds
Chicken breasts, large
Chicken livers
chicken stock
Chili flakes
Chili powder
chili sauce (e.g. sriracha)
Chili sauce (e.g. sriracha)
Chocolate
Chocolate frosting
Chorizo
Ciboulette
Cilantro
cilantro leaves
Cilantro leaves
Cinnamon
Cinnamon sticks
Cloves
......@@ -77,15 +76,15 @@ Cocoa powder
Coconut milk
Coconut oil
Coconut water
cold water
Cold water
cooked beef
Coriander
coriandre seeds
Coriandre seeds
Couscous
Cracked pepper
Cream
Cream cheese
Crushed red peper flakes
Crushed red pepper flakes
Cucumber
Cucumber (large)
Cumin
......@@ -224,7 +223,6 @@ Rock sugar
Rolled oats
Rosemary
Rosé wine
Sachet levure
Saffron
Sage
Salmon
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: recipes master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-23 11:23+0000\n"
"PO-Revision-Date: 2017-12-06 18:01+0700\n"
"PO-Revision-Date: 2018-02-28 17:27+0700\n"
"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
"Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
"Language: id\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.4\n"
"X-Generator: Poedit 2.0.6\n"
#: data/org.gnome.Recipes.desktop.in:3
#: data/appdata/org.gnome.Recipes.appdata.xml.in:6 src/gr-window.ui:14
......@@ -434,7 +434,7 @@ msgstr "Mem_beli Bahan"
#: src/gr-details-page.ui:164 src/gr-edit-page.ui:315
msgid "_Yield"
msgstr "_Yield"
msgstr "_Hasil"
#: src/gr-details-page.ui:218
msgid "Preparation Time"
......@@ -752,7 +752,7 @@ msgstr "Kategori"
#: src/gr-recipes-page.ui:226
msgid "Featured GNOME Chefs"
msgstr "Koki GNOME Unggulan"
msgstr "Koki Unggulan GNOME"
#: src/gr-recipe-tile.ui:58
msgid "Contributed recipe"
......@@ -780,7 +780,7 @@ msgstr "Tidak ada yang menambahkan"
#: src/gr-shopping-tile.ui:101
msgid "Yield"
msgstr "Yield"
msgstr "Hasil"
#: src/gr-time-widget.ui:31
msgid "Start"
......@@ -1878,7 +1878,7 @@ msgstr "Memasak:"
#: src/gr-recipe-formatter.c:93 src/gr-recipe-printer.c:168
msgid "Yield:"
msgstr "Yield:"
msgstr "Hasil:"
#: src/gr-recipe-importer.c:238
#, c-format
......
......@@ -113,6 +113,9 @@ update_label (GrDietRow *self)
case GR_DIET_MILK_FREE:
gtk_label_set_label (GTK_LABEL (self->label), _("Milk-free"));
break;
case GR_DIET_HALAL:
gtk_label_set_label (GTK_LABEL (self->label), _("Halal"));
break;
default:
gtk_label_set_label (GTK_LABEL (self->label), "Unknown");
break;
......@@ -258,6 +261,8 @@ gr_diet_row_get_diet (GrDietRow *row)
return "vegetarian";
case GR_DIET_MILK_FREE:
return "milk-free";
case GR_DIET_HALAL:
return "halal";
default:
return NULL;
}
......
......@@ -45,6 +45,9 @@ gr_diet_get_label (GrDiets diet)
case GR_DIET_MILK_FREE:
label = _("Milk-free recipes");
break;
case GR_DIET_HALAL:
label = _("Halal");
break;
default:
label = _("Other dietary restrictions");
break;
......
......@@ -27,7 +27,8 @@ typedef enum { /*< flags >*/
GR_DIET_NUT_FREE = 2,
GR_DIET_VEGAN = 4,
GR_DIET_VEGETARIAN = 8,
GR_DIET_MILK_FREE = 16
GR_DIET_MILK_FREE = 16,
GR_DIET_HALAL = 32
} GrDiets;
......
......@@ -78,6 +78,7 @@ struct _GrEditPage
GtkWidget *vegan_check;
GtkWidget *vegetarian_check;
GtkWidget *milk_free_check;
GtkWidget *halal_check;
GtkWidget *images;
GtkWidget *add_image_button;
GtkWidget *remove_image_button;
......@@ -1274,6 +1275,7 @@ gr_edit_page_class_init (GrEditPageClass *klass)
gtk_widget_class_bind_template_child (widget_class, GrEditPage, vegan_check);
gtk_widget_class_bind_template_child (widget_class, GrEditPage, vegetarian_check);
gtk_widget_class_bind_template_child (widget_class, GrEditPage, milk_free_check);
gtk_widget_class_bind_template_child (widget_class, GrEditPage, halal_check);
gtk_widget_class_bind_template_child (widget_class, GrEditPage, images);
gtk_widget_class_bind_template_child (widget_class, GrEditPage, add_image_button);
gtk_widget_class_bind_template_child (widget_class, GrEditPage, remove_image_button);
......@@ -1559,6 +1561,7 @@ gr_edit_page_clear (GrEditPage *page)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->vegan_check), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->vegetarian_check), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->milk_free_check), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->halal_check), FALSE);
gtk_widget_hide (page->author_label);
images = gr_image_array_new ();
......@@ -1674,6 +1677,7 @@ gr_edit_page_edit (GrEditPage *page,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->vegan_check), (diets & GR_DIET_VEGAN) != 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->vegetarian_check), (diets & GR_DIET_VEGETARIAN) != 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->milk_free_check), (diets & GR_DIET_MILK_FREE) != 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->halal_check), (diets & GR_DIET_HALAL) != 0);
gr_image_viewer_set_images (GR_IMAGE_VIEWER (page->images), images, index);
......@@ -1754,8 +1758,9 @@ gr_edit_page_save (GrEditPage *page)
diets = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->gluten_free_check)) ? GR_DIET_GLUTEN_FREE : 0) |
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->nut_free_check)) ? GR_DIET_NUT_FREE : 0) |
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->vegan_check)) ? GR_DIET_VEGAN : 0) |
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->vegetarian_check)) ? GR_DIET_VEGETARIAN : 0) |
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->milk_free_check)) ? GR_DIET_MILK_FREE : 0);
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->vegetarian_check)) ? GR_DIET_VEGETARIAN : 0) |
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->milk_free_check)) ? GR_DIET_MILK_FREE : 0) |
(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->halal_check)) ? GR_DIET_HALAL : 0);
images = gr_image_viewer_get_images (GR_IMAGE_VIEWER (page->images));
......
......@@ -673,6 +673,13 @@
<signal name="clicked" handler="set_unsaved" swapped="yes"/>
</object>
</child>
<child>
<object class="GtkCheckButton" id="halal_check">
<property name="visible">1</property>
<property name="label" translatable="yes">Halal</property>
<signal name="clicked" handler="set_unsaved" swapped="yes"/>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
......
......@@ -434,6 +434,11 @@ populate_diets_list (GrQueryEditor *self)
gtk_container_add (GTK_CONTAINER (self->diet_list), row);
gr_diet_row_set_entry (GR_DIET_ROW (row), GD_TAGGED_ENTRY (self->entry));
row = GTK_WIDGET (gr_diet_row_new (GR_DIET_HALAL));
gtk_widget_show (row);
gtk_container_add (GTK_CONTAINER (self->diet_list), row);
gr_diet_row_set_entry (GR_DIET_ROW (row), GD_TAGGED_ENTRY (self->entry));
gtk_list_box_set_header_func (GTK_LIST_BOX (self->diet_list),
diet_header_func, self, NULL);
......
......@@ -781,6 +781,7 @@ gr_recipe_matches (GrRecipe *recipe,
{ GR_DIET_VEGAN, "vegan" },
{ GR_DIET_VEGETARIAN, "vegetarian" },
{ GR_DIET_MILK_FREE, "milk-free" },
{ GR_DIET_HALAL, "halal" },
{ 0, NULL }
};
GrDiets d = 0;
......
......@@ -240,10 +240,15 @@ ingredient_format_unit (Ingredient *ing)
a1 += a;
}
else {
g_error ("conversion yielded different units...why...");
if (s->len > 0)
g_string_append (s, ", ");
gr_convert_format (s, a, u);
g_warning ("conversion yielded different units (%s: %s vs %s)...why...", ing->ingredient, gr_unit_get_name (u), gr_unit_get_name (u1));
}
}
if (s->len > 0)
g_string_append (s, ", ");
gr_convert_format (s, a1, u1);
return g_strdup (s->str);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment