add locale to aspects

app/assets/javascripts/app/collections/aspects.js

@@ -20,6 +20,7 @@ app.collections.Aspects = Backbone.Collection.extend({
   },
 
   toSentence: function(){
-    return this.selectedAspects('name').join(", ").replace(/,\s([^,]+)$/, ' and $1') || 'My Aspects'
+    var separator = Diaspora.I18n.t("comma") + ' ';
+    return this.selectedAspects('name').join(separator).replace(/,\s([^,]+)$/, ' ' + Diaspora.I18n.t("and") + ' $1') || Diaspora.I18n.t("my_aspects");
   }
 })

app/assets/templates/aspect_tpl.jst.hbs

@@ -1,6 +1,6 @@
 <div class="edit">
   <a href="/aspects/{{id}}/edit" rel="facebox">
-    <img alt="Pencil" src="{{imageUrl "icons/pencil.png"}}" title="Edit {{name}}">
+    <img alt="Pencil" src="{{imageUrl "icons/pencil.png"}}" title="{{t 'edit'}} {{name}}">
   </a>
 </div>
 <a class="aspect_selector name" data-guid="{{id}}" href="/aspects/query"> {{name}} </a>

config/locales/javascript/javascript.en.yml

@@ -9,6 +9,9 @@ en:
     delete: "Delete"
     ignore: "Ignore"
     ignore_user: "Ignore this user?"
+    and: "and"
+    comma: ","
+    edit: "Edit"
     timeago:
       prefixAgo: ""
       prefixFromNow: ""
@@ -28,6 +31,7 @@ en:
 
     my_activity: "My Activity"
     my_stream: "Stream"
+    my_aspects: "My Aspects"
 
     videos:
       watch: "Watch this video on <%= provider %>"

spec/javascripts/app/collections/aspects_spec.js

@@ -1,5 +1,10 @@
 describe("app.collections.Aspects", function(){
   beforeEach(function(){
+    Diaspora.I18n.loadLocale({
+      'and' : "and",
+      'comma' : ",",
+      'my_aspects' : "My Aspects"
+    });
     var my_aspects = [{ name: 'Work',          selected: true  },
                       { name: 'Friends',       selected: false },
                       { name: 'Acquaintances', selected: false }]