diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/js/contacts.js | 4 | ||||
| -rw-r--r-- | apps/contacts/templates/index.php | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js index b72f3c9a678..cc4da5837e0 100644 --- a/apps/contacts/js/contacts.js +++ b/apps/contacts/js/contacts.js @@ -919,6 +919,7 @@ Contacts={ featureClass: "P", style: "full", maxRows: 12, + lang: lang, name_startsWith: request.term }, success: function( data ) { @@ -937,7 +938,7 @@ Contacts={ }, minLength: 2, select: function( event, ui ) { - if(ui.item) { + if(ui.item && $('#adr_country').val().trim().length == 0) { $('#adr_country').val(ui.item.country); } /*log( ui.item ? @@ -961,6 +962,7 @@ Contacts={ featureCode: "PCLI", /*countryBias: "true",*/ /*style: "full",*/ + lang: lang, maxRows: 12, name_startsWith: request.term }, diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index af159ce9c60..d68dd68f605 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -1,6 +1,7 @@ <script type='text/javascript'> var totalurl = '<?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?>/addressbooks'; var categories = <?php sort($_['categories']); echo json_encode($_['categories']); ?>; + var lang = '<?php echo OC_Preferences::getValue(OC_User::getUser(), 'core', 'lang', 'en'); ?>'; </script> <div id="controls"> <form> |