Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:16:53 +0000 (12:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:16:53 +0000 (12:16 +0100)
1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/js/ContactGrid.js

@@@ -262,8 -262,14 +262,13 @@@ Tine.Addressbook.ContactGridPanel.displ
      return data ? data : ('<div class="renderer_displayNameRenderer_noName">' + i18n._('No name') + '</div>');
  };
  
+ Tine.Addressbook.ContactGridPanel.countryRenderer = function(data) {
+     data = Locale.getTranslationData('CountryList', data);
+     return data;
+ };
  /**
 - * Statically constructs the columns used to represent a contact. Reused by ListMemberGridPanel
 - *
 + * Statically constructs the columns used to represent a contact. Reused by ListMemberGridPanel + ListMemberRoleGridPanel
   */
  Tine.Addressbook.ContactGridPanel.getBaseColumns = function(i18n) {
      return [