Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Camera.getPicture reflect mediaType, FileTransfer.abort delete incomplete file #4

Closed
wants to merge 2 commits into from
Closed

Camera.getPicture reflect mediaType, FileTransfer.abort delete incomplete file #4

wants to merge 2 commits into from

Conversation

coryjthompson
Copy link
Contributor

@shazron
Copy link
Member

shazron commented Dec 21, 2012

Thanks! We're wrapping up 2.3.0 (and most of us are off for the holidays) but this will definitely get in 2.4.0

@shazron
Copy link
Member

shazron commented Jan 2, 2013

Good point Becky - we'll have to add an issue to add the appropriate strings to Resources/xx.lproj (where xx is de, se, en, and es localizations). See CDVCapture for how it uses localization (search for NSLocalizedString)

@shazron
Copy link
Member

shazron commented Jan 2, 2013

I'll cherry-pick in coryjthompson@aea423b for 2.3.0, but leave the other commit for 2.4.0. Cory in the future it is best if the two fixes occur in two separate pull requests.

khawkins referenced this pull request in khawkins/cordova-ios Feb 10, 2013
@khawkins
Merge pull request #4 from khawkins/cdv_22_upgrade
ee85c5a 
Cordova 2.2 upgrade
khawkins referenced this pull request in khawkins/cordova-ios Feb 21, 2013
@khawkins
Merge pull request #4 from khawkins/unstable_master_merge
7f3be0e 
Merging unstable into master (prep for 1.5 release)
@jamesjong
Copy link
Contributor

This pull request can now be closed.

I cherry-picked the other commit.

I also added localized string in this commit:
https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git;a=commit;h=aaf5ccb3f561cb3fb935afa73d5f1a6dda98fa35

@shazron
Copy link
Member

shazron commented Jan 24, 2014

@coryjthompson please close this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@coryjthompson @shazron @jamesjong @becka11y