Merge pull request #1618 from uProxy/description-polymer-error

Switch syntax for the default device description

Author: jpevarnek

src/generic_ui/polymer/description.html

@@ -49,7 +49,7 @@
       <paper-button raised on-tap="{{ cancelEditing }}">{{ 'cancel' | $$ }}</paper-button>
     </div>
     <div id='savedDescription' hidden?='{{ editing }}' on-tap='{{ editDescription }}'>
-      {{ model.globalSettings.description || ('nameThisDevice' | $$) }}
+      {{ showDescription(model.globalSettings.description) }}
       <core-icon icon='create'></core-icon>
     </div>
   </template>

src/generic_ui/polymer/description.ts

@@ -18,5 +18,8 @@ Polymer({
     this.model = ui_context.model;
     this.editing = false;
     this.descriptionInput = '';
+  },
+  showDescription: function(description :string) {
+    return description ? description : ui_context.ui.i18n_t('nameThisDevice');
   }
 });