frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2018-03-19 13:59:07 +01:00
commit 81f0d0e3f2
2 changed files with 999 additions and 987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SendAs/FeatureSendAs.cs
View File

@ -121,22 +121,34 @@ namespace Acacia.Features.SendAs
} }
private static readonly BoolOption OPTION_GAB_LOOKUP = new BoolOption("GABLookup", true); private static readonly BoolOption OPTION_GAB_LOOKUP = new BoolOption("GABLookup", true);
[AcaciaOption("Enables local resolving look ups for senders. This is disabled by default, as it seems " +
"local contacts may lead to wrong senders.")]
public bool ResolveLocal
{
get { return GetOption(OPTION_RESOLVE_LOCAL); }
set { SetOption(OPTION_RESOLVE_LOCAL, value); }
}
private static readonly BoolOption OPTION_RESOLVE_LOCAL = new BoolOption("ResolveLocal", false);
internal IRecipient FindSendAsSender(ZPushAccount zpush, GABUser user) internal IRecipient FindSendAsSender(ZPushAccount zpush, GABUser user)
{ {
// First try a simple resolve, this will work if the username is unique // First try a simple resolve, this will work if the username is unique
IRecipient recip = ThisAddIn.Instance.ResolveRecipient(user.UserName); if (ResolveLocal)
if (recip != null)
{ {
// If it's resolved, we're good. Otherwise dispose and continue IRecipient recip = ThisAddIn.Instance.ResolveRecipient(user.UserName);
if (recip.IsResolved) if (recip != null)
{ {
Logger.Instance.Trace(this, "Resolved send-as: {0}", recip.Name); // If it's resolved, we're good. Otherwise dispose and continue
return recip; if (recip.IsResolved)
} {
else Logger.Instance.Trace(this, "Resolved send-as: {0}", recip.Name);
{ return recip;
Logger.Instance.Trace(this, "Unresolved send-as: {0}", user.UserName); }
recip.Dispose(); else
{
Logger.Instance.Trace(this, "Unresolved send-as: {0}", user.UserName);
recip.Dispose();
}
} }
} }

4
translations/de.po
View File

@ -4,8 +4,7 @@ msgstr ""
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2018-03-19 11:40+0000\n" "PO-Revision-Date: 2018-03-19 11:40+0000\n"
"Last-Translator: Hans-Peter <h.stradinger@kopano.com>\n" "Last-Translator: Hans-Peter <h.stradinger@kopano.com>\n"
"Language-Team: German <http://translate.kopano.io/projects/kopano/kopano-ol-" "Language-Team: German <http://translate.kopano.io/projects/kopano/kopano-ol-extension/de/>\n"
"extension/de/>\n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -1485,3 +1484,4 @@ msgstr "Übernehmen"
msgctxt "AcaciaZPushPlugin\\Features\\SyncState\\SyncStateDialog\\buttonResetTimeFrame.Text" msgctxt "AcaciaZPushPlugin\\Features\\SyncState\\SyncStateDialog\\buttonResetTimeFrame.Text"
msgid "Reset" msgid "Reset"
msgstr "Zurücksetzen" msgstr "Zurücksetzen"