public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed localization which was broken after 19fe5331d2

Browse source 
x_mailer fixed to be '' in mailtrain.sql
This commit is contained in:
Tomas Bures 2018-12-26 05:24:52 +01:00
parent cfdcaf65d8
commit 99bd4ad907
2 changed files with 62 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
locales/en-US/common.json
View file

@ -203,16 +203,50 @@
"triggered": "Triggered",
"campaigns": "Campaigns",
"campaignStatistics": "Campaign Statistics",
"subscriptionHasToBeSelectedToShowThe": "Subscription has to be selected to show the campaign for a test user.",
"total": "Total",
"delivered": "Delivered",
"blacklisted": "Blacklisted",
"bounced": "Bounced",
"complaints": "Complaints",
"unsubscribed": "Unsubscribed",
"opened": "Opened",
"clicked": "Clicked",
"uniqueVisitors": "Unique visitors",
"totalClicks": "Total clicks",
"campaignLinks": "Campaign links",
"subscriptionId": "Subscription ID",
"listId": "List ID",
"listNamespace": "List namespace",
"opensCount": "Opens count",
"countries": "Countries",
"devices": "Devices",
"desktop": "Desktop",
"tv": "TV",
"tablet": "Tablet",
"phone": "Phone",
"bot": "Bot",
"car": "Car",
"console": "Console",
"distributionByDeviceType": "Distribution by device type",
"loadingChart": "Loading chart",
"deviceType": "Device type",
"count": "Count",
"unknown": "Unknown",
"distributionByCountry": "Distribution by country",
"country": "Country",
"detailedStatistics": "Detailed Statistics",
"listOfSubscribersThatOpenedTheCampaign": "List of subscribers that opened the campaign",
"subscriptionHasToBeSelectedToShowThe": "Subscription has to be selected to show the campaign for a test user.",
"previewCampaignAs": "Preview campaign as",
"preview": "Preview",
"dateMustNotBeEmpty": "Date must not be empty",
"dateIsInvalid": "Date is invalid",
"timeMustNotBeEmpty": "Time must not be empty",
"timeIsInvalid": "Time is invalid",
"confirmReset": "Confirm reset",
"doYouWantToResetTheCampaign?All": "Do you want to reset the campaign? All statistics and the track of delivered messages will be lost.",
"no": "No",
"yes": "Yes",
"subscribers-1": "subscribers",
"sendStatus": "Send status",
"campaignIsScheduledForDelivery": "Campaign is scheduled for delivery.",
@ -236,7 +270,6 @@
"yourCampaignIsEnabledAndSendingMessages": "Your campaign is enabled and sending messages.",
"disable": "Disable",
"campaignStatus": "Campaign Status",
"computing": "computing ...",
"targetListssegments": "Target lists/segments",
"ifANewEntryIsFoundFromCampaignFeedANew": "If a new entry is found from campaign feed a new subcampaign is created of that entry and it will be listed here",
"sendingTestEmail": "Sending test email",
@ -251,6 +284,12 @@
"inactive": "Inactive",
"active": "Active",
"campaignName": "Campaign \"{{name}}\"",
"deliveredEmails": "Delivered Emails",
"complained": "Complained",
"subscribersThatComplained": "Subscribers that Complained",
"emailsThatBounced": "Emails that Bounced",
"subscribersThatUnsubscribed": "Subscribers that Unsubscribed",
"clicks": "Clicks",
"theseFilesArePubliclyAvailableViaHttpSo": "These files are publicly available via HTTP so that they can be linked to from the content of the campaign.",
"theseFilesWillBeAttachedToTheCampaign": "These files will be attached to the campaign emails as proper attachments. This means they count towards to the eventual size of the email.",
"triggerName": "Trigger \"{{name}}\"",
@ -270,13 +309,8 @@
"selectTheEventThatTriggersSendingThe": "Select the event that triggers sending the campaign.",
"enabled": "Enabled",
"daysAfter": "Days after",
"yes": "Yes",
"no": "No",
"latestOpen": "Latest open",
"latestClick": "Latest click",
"delivered": "Delivered",
"opened": "Opened",
"clicked": "Clicked",
"notOpened": "Not opened",
"notClicked": "Not clicked",
"close": "Close",
@ -339,7 +373,7 @@
"createList": "Create List",
"thisIsTheListIdDisplayedToTheSubscribers": "This is the list ID displayed to the subscribers",
"contactEmail": "Contact email",
"contactEmailUsedInSubscriptionFormsAnd": "Contact email used in subscription forms and emails that are sent out. If not filled in, the admin email from the global settings will be used.",
"contactEmailShownInTheListSubscription": "Contact email shown in the list subscription and management forms. If no contact email is given, the admin email from Global settings is used.",
"homepage": "Homepage",
"homepageUrlUsedInSubscriptionFormsAnd": "Homepage URL used in subscription forms and emails that are sent out. If not filled in, the default homepage from global settings will be used.",
"recipientsNameTemplate": "Recipients name template",
@ -451,6 +485,8 @@
"formsPreview": "Forms Preview",
"listToPreviewOn": "List To Preview On",
"selectListWhoseFieldsWillBeUsedToPreview": "Select list whose fields will be used to preview the forms.",
"noteTheseLinksAreSolelyForAQuickPreview": "Note: These links are solely for a quick preview. To get the address of the subscription form, go to the list\\'s subscribers and click on \"Subscription Form\".",
"formPreview": "Form preview:",
"templates": "Templates",
"customFormsUseMjmlForFormattingSeeThe": "Custom forms use MJML for formatting. See the MJML documentation <1>here</1>",
"createCustomForm": "Create Custom Form",
@ -628,7 +664,6 @@
"testUser?": "Test user?",
"ifCheckedThenThisSubscriptionCanBeUsed": "If checked then this subscription can be used for previewing campaign messages",
"erased": "[ERASED]",
"blacklisted": "Blacklisted",
"confirmUnsubscription": "Confirm Unsubscription",
"areYouSureYouWantToUnsubscribeEmail?": "Are you sure you want to unsubscribe {{email}}?",
"unsubscribingEmail": "Unsubscribing {{email}}",
@ -643,8 +678,6 @@
"addSubscriber": "Add Subscriber",
"subscribed": "Subscribed",
"unubscribed": "Unubscribed",
"bounced": "Bounced",
"complained": "Complained",
"parentNamespaceMustBeSelected": "Parent Namespace must be selected",
"namespaceSaved": "Namespace saved",
"thereHasBeenALoopDetectedInTheAssignment": "There has been a loop detected in the assignment of the parent namespace. This is most likely because someone else has changed the parent of some namespace in the meantime. Refresh your page to start anew. Please note that your changes will be lost.",
@ -678,11 +711,13 @@
"viewConsoleOutput": "View console output",
"reportTemplates": "Report Templates",
"reports": "Reports",
"reportName": "Report {{name}}",
"loadingReport": "Loading report ...",
"outputForReportName": "Output for report {{name}}",
"loadingReportOutput": "Loading report output ...",
"reportName": "Report {{name}}",
"reportIsBeingGenerated": "Report is being generated",
"reportNotGenerated": "Report not generated",
"loadingReport": "Loading report ...",
"refresh": "Refresh",
"reportName-1": "Report \"{{name}}\"",
"output": "Output",
"templateName": "Template \"{{name}}\"",
@ -701,15 +736,15 @@
"writeTheBodyOfTheJavaScriptFunctionWith": "Write the body of the JavaScript function with signature <1>function(inputs, callback)</1> that returns an object to be rendered by the Handlebars template below.",
"useHtmlWithHandlebarsSyntaxSee": "Use HTML with Handlebars syntax. See documentation <1>here</1>.",
"blank": "Blank",
"allSubscribers": "All Subscribers",
"groupedSubscribers": "Grouped Subscribers",
"exportListAsCsv": "Export List as CSV",
"openCounts": "Open counts",
"openCountsAsCsv": "Open counts as CSV",
"aggregratedOpenCounts": "Aggregrated open counts",
"current": "(current)",
"toggleNavigation": "Toggle navigation",
"administration": "Administration",
"users": "Users",
"globalSettings": "Global Settings",
"sendConfigurations": "Send Configurations",
"sendConfigurations": "Send configurations",
"logOut": "Log out",
"home": "Home",
"sourceOnGitHub": "Source on GitHub",
@ -728,7 +763,7 @@
"subject": "Subject",
"xMailer": "X-Mailer",
"verpBounceHandling": "VERP Bounce Handling",
"verpEnabled": "VERP Enabled",
"verpEnabled": "verpEnabled",
"serverHostname": "Server hostname",
"theVerpServerHostnameEgBouncesexamplecom": "The VERP server hostname, eg. bounces.example.com",
"verpBounceHandlingServerHostnameThis": "VERP bounce handling server hostname. This hostname is used in the SMTP envelope FROM address and the MX DNS records should point to this server",
@ -748,6 +783,10 @@
"useast1": "US-EAST-1",
"uswest2": "US-WEST-2",
"euwest1": "EU-WEST-1",
"builtinZoneMta": "Built-in ZoneMTA",
"dynamicConfigurationOfDkimKeysViaZoneMt": "Dynamic configuration of DKIM keys via ZoneMTA\\'s Mailtrain plugin (use this option for builtin ZoneMTA)",
"dynamicConfigurationOfDkimKeysViaZoneMt-1": "Dynamic configuration of DKIM keys via ZoneMTA\\'s HTTP config plugin",
"noDynamicConfigurationOfDkimKeys": "No dynamic configuration of DKIM keys",
"mailerSettings": "Mailer Settings",
"mailerType": "Mailer type",
"hostname": "Hostname",
@ -769,6 +808,7 @@
"throttling": "Throttling",
"messagesPerHourEg1000": "Messages per hour eg. 1000",
"maximumNumberOfMessagesToSendInAnHour": "Maximum number of messages to send in an hour. Leave empty or zero for no throttling. If your provider uses a different speed limit (messages/minute or messages/second) then convert this limit into messages/hour (1m/s => 3600m/h). This limit is per sending process.",
"dynamicConfiguration": "Dynamic configuration",
"dkimSigning": "DKIM Signing",
"zoneMtaDkimApiKey": "ZoneMTA DKIM API key",
"secretValueKnownToZoneMtaForRequesting": "Secret value known to ZoneMTA for requesting DKIM key information. If this value was generated by the Mailtrain installation script then you can keep it as it is.",
@ -793,6 +833,9 @@
"trackingId": "Tracking ID",
"uaxxxxxxx": "UA-XXXXX-XX",
"enterGoogleAnalyticsTrackingCode": "Enter Google Analytics tracking code",
"googleMapsApiKey": "Google Maps API Key",
"xxxxxx": "XXXXXX",
"theMapOverviewInCampaignStatistics": "The map overview in campaign statistics requires a Google Maps API key. Please enter it here. If no key is given, Google may throttle map requests, which will result in occassional unavailability of the map in the campaign statistics.",
"frontpageShoutOut": "Frontpage shout out",
"htmlCodeShownInTheFrontPageHeaderSection": "HTML code shown in the front page header section",
"gpgSigning": "GPG Signing",

2
server/setup/sql/mailtrain.sql
View file

@ -533,7 +533,7 @@ CREATE TABLE `send_configurations` (
KEY `send_configurations_namespace_foreign` (`namespace`),
CONSTRAINT `send_configurations_namespace_foreign` FOREIGN KEY (`namespace`) REFERENCES `namespaces` (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
INSERT INTO `send_configurations` (`id`, `cid`, `name`, `description`, `from_email`, `from_email_overridable`, `from_name`, `from_name_overridable`, `reply_to`, `reply_to_overridable`, `subject`, `subject_overridable`, `verp_hostname`, `mailer_type`, `mailer_settings`, `created`, `namespace`, `x_mailer`) VALUES (1,'system','System','Send configuration used to deliver system emails','admin@example.com',1,'My Awesome Company',1,'admin@example.com',1,'Test message',1,NULL,'zone_mta','{\"maxConnections\":5,\"throttling\":0,\"logTransactions\":false,\"maxMessages\":100,\"zoneMtaType\":3}',NOW(),1,NULL);
INSERT INTO `send_configurations` (`id`, `cid`, `name`, `description`, `from_email`, `from_email_overridable`, `from_name`, `from_name_overridable`, `reply_to`, `reply_to_overridable`, `subject`, `subject_overridable`, `verp_hostname`, `mailer_type`, `mailer_settings`, `created`, `namespace`, `x_mailer`) VALUES (1,'system','System','Send configuration used to deliver system emails','admin@example.com',1,'My Awesome Company',1,'admin@example.com',1,'Test message',1,NULL,'zone_mta','{\"maxConnections\":5,\"throttling\":0,\"logTransactions\":false,\"maxMessages\":100,\"zoneMtaType\":3}',NOW(),1,'');
CREATE TABLE `settings` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`key` varchar(255) CHARACTER SET ascii NOT NULL DEFAULT '',