Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wymsee/cordova-imagePicker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: cupidergit/cordova-imagePicker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 1, 2016

  1. title改成中文

    dillon committed Mar 1, 2016
    Copy the full SHA
    5f5ad7b View commit details
  2. 1.0.7->1.0.7.1

    dillon committed Mar 1, 2016
    Copy the full SHA
    b5bd458 View commit details

Commits on Mar 2, 2016

  1. 修改message,去掉title

    dillon committed Mar 2, 2016
    Copy the full SHA
    11bde5b View commit details
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="com.synconset.imagepicker"
version="1.0.7">
version="1.0.7.1">

<name>ImagePicker</name>

Original file line number Diff line number Diff line change
@@ -4,6 +4,6 @@
<string name="free_version_label">Free version - Images left: %d</string>
<string name="error_database">There was an error opening the images database. Please report the problem.</string>
<string name="requesting_thumbnails">Requesting thumbnails, please be patient</string>
<string name="discard">Cancel</string>
<string name="done">OK</string>
<string name="discard">取消</string>
<string name="done">确定</string>
</resources>
10 changes: 5 additions & 5 deletions src/android/Library/src/MultiImageChooserActivity.java
Original file line number Diff line number Diff line change
@@ -173,8 +173,8 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
setupHeader();
updateAcceptButton();
progress = new ProgressDialog(this);
progress.setTitle("Processing Images");
progress.setMessage("This may take a few moments");
//progress.setTitle("处理中");
progress.setMessage("处理中,请耐心等待...");
}

@Override
@@ -189,9 +189,9 @@ public void onItemClick(AdapterView<?> arg0, View view, int position, long id) {
if (maxImages == 0 && isChecked) {
isChecked = false;
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Maximum " + maxImageCount + " Photos");
builder.setMessage("You can only select " + maxImageCount + " photos at a time.");
builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
//builder.setTitle("最多" + maxImageCount + "张照片");
builder.setMessage("你最多只能选择" + maxImageCount + "张照片。");
builder.setPositiveButton("我知道了", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
}
4 changes: 2 additions & 2 deletions src/ios/ELCImagePicker/ELCAlbumPickerController.m
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];

[self.navigationItem setTitle:@"Loading..."];
[self.navigationItem setTitle:@"加载中..."];

UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self.parent action:@selector(cancelImagePicker)];
[self.navigationItem setRightBarButtonItem:cancelButton];
@@ -85,7 +85,7 @@ - (void)viewDidLoad
- (void)reloadTableView
{
[self.tableView reloadData];
[self.navigationItem setTitle:@"Select an Album"];
[self.navigationItem setTitle:@"照片"];
}

- (BOOL)shouldSelectAsset:(ELCAsset *)asset previousCount:(NSUInteger)previousCount
4 changes: 2 additions & 2 deletions src/ios/ELCImagePicker/ELCAssetTablePicker.m
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ - (void)viewDidLoad
} else {
UIBarButtonItem *doneButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneAction:)];
[self.navigationItem setRightBarButtonItem:doneButtonItem];
[self.navigationItem setTitle:@"Loading..."];
[self.navigationItem setTitle:@"加载中..."];
}

[self performSelectorInBackground:@selector(preparePhotos) withObject:nil];
@@ -107,7 +107,7 @@ - (void)preparePhotos
animated:NO];
}

[self.navigationItem setTitle:self.singleSelection ? @"Pick Photo" : @"Pick Photos"];
[self.navigationItem setTitle:self.singleSelection ? @"选取照片" : @"选取照片"];
});
}
}
7 changes: 3 additions & 4 deletions src/ios/ELCImagePicker/ELCImagePickerController.m
Original file line number Diff line number Diff line change
@@ -49,13 +49,12 @@ - (BOOL)shouldSelectAsset:(ELCAsset *)asset previousCount:(NSUInteger)previousCo
{
BOOL shouldSelect = previousCount < self.maximumImagesCount;
if (!shouldSelect) {
NSString *title = [NSString stringWithFormat:NSLocalizedString(@"Maximum %d photos.", nil), self.maximumImagesCount];
NSString *message = [NSString stringWithFormat:NSLocalizedString(@"You can only select %d photos at a time.", nil), self.maximumImagesCount];
[[[UIAlertView alloc] initWithTitle:title
NSString *message = [NSString stringWithFormat:NSLocalizedString(@"你最多只能选择%d张照片。", nil), self.maximumImagesCount];
[[[UIAlertView alloc] initWithTitle:nil
message:message
delegate:nil
cancelButtonTitle:nil
otherButtonTitles:NSLocalizedString(@"Okay", nil), nil] show];
otherButtonTitles:NSLocalizedString(@"我知道了", nil), nil] show];
}
return shouldSelect;
}