kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed sharing bookmarks string usage

Browse source
This commit is contained in:
r.kuznetsov 2018-04-10 19:54:37 +03:00 • committed by Vlad Mihaylenko
parent ee56ab2e1f
commit 8cfc3d192e
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/util/sharing/SharingHelper.java
View file

@ -214,9 +214,7 @@ public enum SharingHelper
String name = new File(result.getSharingPath()).getName();
shareOutside(new LocalFileShareable(context, result.getSharingPath(),
"application/vnd.google-earth.kmz")
// TODO fix translation for some languages, that doesn't contain holder
// for filename
.setText(context.getString(R.string.share_bookmarks_email_body, name))
.setText(context.getString(R.string.share_bookmarks_email_body))
.setSubject(R.string.share_bookmarks_email_subject));
break;
case BookmarkSharingResult.EMPTY_CATEGORY:

2
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -450,7 +450,7 @@
auto myData = [[NSData alloc] initWithBytes:data.data() length:data.size()];
[mailVC addAttachmentData:myData mimeType:mimeType fileName:[NSString stringWithFormat:@"%@%@", catName, fileExtension]];
}
[mailVC setMessageBody:[NSString stringWithFormat:L(@"share_bookmarks_email_body"), catName] isHTML:NO];
[mailVC setMessageBody:L(@"share_bookmarks_email_body") isHTML:NO];
[self presentViewController:mailVC animated:YES completion:nil];
}

2
iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
View file

@ -78,7 +78,7 @@ final class BMCViewController: MWMViewController {
let shareOnSuccess = { [viewModel] (url: URL) in
typealias AVC = MWMActivityViewController
let fileName = (url.lastPathComponent as NSString).deletingPathExtension
let message = String(coreFormat: L("share_bookmarks_email_body"), arguments: [fileName])
let message = L("share_bookmarks_email_body")
let shareController = AVC.share(for: url, message: message) { [viewModel] _, _, _, _ in
viewModel?.finishShareCategory()
}