Merge lp:~elementary-apps/appcenter/fix-uppercase-category into lp:~elementary-apps/appcenter/appcenter

[Danielle Foré]

* Don't uppercase categories in back button
* Use max-width chars to wrap text instead of /n

Fixes category labels being uppercase in the back button and removes line wrap from string. Sets a max-width chars and does .up () for categories to style them.

[lp:~elementary-apps/appcenter/fix-uppercase-category]

202. By Danielle Foré on 2016-06-16

capitalize games

203. By Danielle Foré on 2016-06-16

remove manual newline from science & engineering

=== modified file 'src/Views/CategoryView.vala'
--- src/Views/CategoryView.vala	2016-06-12 22:00:29 +0000
+++ src/Views/CategoryView.vala	2016-06-16 00:50:20 +0000
@@ -205,7 +205,7 @@
 
     private Widgets.CategoryItem get_games_category () {
         var category = new AppStream.Category ();
-        category.set_name (_("GAMES"));
+        category.set_name (_("Games"));
         var categories = new Gee.LinkedList<string> ();
         categories.add ("Game");
         category.set_data<Gee.LinkedList> ("categories", categories);
@@ -243,8 +243,7 @@
 
     private Widgets.CategoryItem get_science_category () {
         var category = new AppStream.Category ();
-        // TRANSLATORS: We need to force the newline so that the buttons get a decent size
-        category.set_name (_("Science &\nEngineering"));
+        category.set_name (_("Science & Engineering"));
         var categories = new Gee.LinkedList<string> ();
         categories.add ("Science");
         category.set_data<Gee.LinkedList> ("categories", categories);
@@ -256,8 +255,7 @@
 
     private Widgets.CategoryItem get_a11y_category () {
         var category = new AppStream.Category ();
-        // TRANSLATORS: We need to force the newline so that the buttons get a decent size
-        category.set_name (_("UNIVERSAL\nACCESS"));
+        category.set_name (_("Universal Access"));
         category.set_icon ("applications-accessibility-symbolic");
         var categories = new Gee.LinkedList<string> ();
         categories.add ("Accessibility");
 
=== modified file 'src/Widgets/CategoryItem.vala'
--- src/Widgets/CategoryItem.vala	2016-05-04 19:38:51 +0000
+++ src/Widgets/CategoryItem.vala	2016-06-16 00:50:20 +0000
@@ -220,7 +220,6 @@
 
     public CategoryItem (AppStream.Category app_category) {
         this.app_category = app_category;
-        name_label.label = app_category.name;
         tooltip_text = app_category.summary ?? "";
         if (app_category.icon != null) {
             display_image.icon_name = app_category.icon;
@@ -263,6 +262,7 @@
 
         name_label = new Gtk.Label (null);
         name_label.wrap = true;
+        name_label.max_width_chars = 15;
         grid.add (name_label);
 
         var expanded_grid = new Gtk.Grid ();
@@ -280,5 +280,10 @@
 
     public void add_category_class (string theme_name) {
         themed_grid.get_style_context ().add_class (theme_name);
+        if (theme_name == "games" || theme_name == "accessibility") {
+            name_label.label = app_category.name.up ();
+        } else {
+            name_label.label = app_category.name;
+        }
     }
 }