rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

Contacts: Better wording for merge dialog.

Browse Source
This commit is contained in:
Thomas Tanghus 2013-04-05 19:06:26 +02:00
parent a4f8b0002c
commit 32ba67735e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/app.js
View File

@ -1401,7 +1401,7 @@ OC.Contacts = OC.Contacts || {
height: 'auto', width: 'auto',
buttons: [
{
text: t('contacts', 'OK'),
text: t('contacts', 'Merge contacts'),
click:function() {
// Do the merging, use $(this) to get dialog
var contactid = $(this).find('input:radio:checked').val();
@ -1610,7 +1610,7 @@ OC.Contacts = OC.Contacts || {
},
cloudPhotoSelected:function(metadata, path) {
var self = this;
console.log('cloudPhotoSelected, id', id);
console.log('cloudPhotoSelected', metadata);
$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),
{path: path, contact: metadata},function(jsondata) {
if(jsondata.status == 'success') {

2
templates/contacts.php
View File

@ -144,7 +144,7 @@
<script id="mergeContactsTemplate" type="text/template">
<div id="dialog-merge-contacts" title="<?php p($l->t('Merge contacts')); ?>">
<p><?php p($l->t('Select which contact to merge into')); ?></p>
<p><?php p($l->t('Which contact should the data be merged into?')); ?></p>
<fieldset>
<ul class="mergelist"></ul>
</fieldset>