Skip to content

Commit

Permalink
Commit Plugin Version 1.8.5
Browse files Browse the repository at this point in the history 
Minor enhancements
  • Loading branch information
valeriiiiiia committed Nov 28, 2016
1 parent 19cb4e2 commit 06239fd
Show file tree
Hide file tree
Showing 13 changed files with 137 additions and 122 deletions.
2 changes: 1 addition & 1 deletion affilinet.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
Plugin Name: affilinet Performance Ads
Description: Integrate our data driven and automated performance display plugin into your WordPress platform and serve your users targeted ads in real time.
Version: 1.8.3
Version: 1.8.4
Author: affilinet
Author URI: https://www.affili.net/de/publisher/tools/performance-ads
License: GPLv2 or later
Expand Down
2 changes: 1 addition & 1 deletion classes/Helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public static function getQualityStandardsLink()
case 6: // CH
return 'https://www.affili.net/ch/advertiser/plattform/sicherheit-und-transparenz';
case 2: // UK
return 'https://www.affili.net/uk/advertisers-andagencies/platform/quality-management';
return 'https://www.affili.net/uk/advertisers-and-agencies/platform/quality-management';
case 3: // FR
return 'https://www.affili.net/fr/annonceurs-et-agences/plateforme/securite-et-transparence';
case 4: // NL (not implemented)
Expand Down
2 changes: 1 addition & 1 deletion classes/View.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function euroFormatter(v, axis)
{data: affilinet_report_data_clicks, label: "<?php _e('Clicks', 'affilinet'); ?>", yaxis: 1},
{
data: affilinet_report_data_total,
label: "<?php _e('Confirmed Commission (€)', 'affilinet'); ?>",
label: "<?php _e('Open Commission', 'affilinet'); ?>",
yaxis: 2
}
], options);
Expand Down
190 changes: 95 additions & 95 deletions classes/Widget.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ public function form($instance)
public static function getAllowedSizesJsonForTinyMce()
{
$sizes = self::allowedSizes();
$return = [];
$return = array();

foreach ($sizes as $category) {
$return[] = ['text' => $category['name'], 'disabled' => true];
$return[] = array('text' => $category['name'], 'disabled' => true);
foreach ($category['values'] as $entry) {
$return[] = ['text' => $entry['name'], 'value' => $entry['value'], 'disabled' => false];
$return[] = array('text' => $entry['name'], 'value' => $entry['value'], 'disabled' => false);
}
}
return json_encode($return, JSON_PRETTY_PRINT);
Expand All @@ -79,42 +79,42 @@ public static function getAllowedSizesJsonForTinyMce()
*/
private static function allowedSizes()
{
$allowedPlatFormSizes = [
$allowedPlatFormSizes = array(

// DE
1 => [
['name' => '----- DESKTOP -----', 'values' =>
[
['value' => '728x90', 'name' => 'Super Banner (728px x 90px)'],
['value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'],
['value' => '250x250', 'name' => 'Square Button (250px x 250px)'],
['value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'],
['value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'],
['value' => '120x600', 'name' => 'Scyscraper (120px x 600px)']
]
],
['name' => '----- MOBILE -----', 'values' =>
[
['value' => '168x28', 'name' => 'Feature Phone Medium Banner (168px x 28px)'],
['value' => '216x36', 'name' => 'Feature Phone Large Banner (216px x 36px)'],
['value' => '300x50', 'name' => 'Smartphone Banner (300px x 50px)'],
['value' => '320x50', 'name' => 'Smartphone Wide Banner (320px x 50px)']
]
]
1 => array(
array('name' => '----- DESKTOP -----', 'values' =>
array(
array('value' => '728x90', 'name' => 'Super Banner (728px x 90px)'),
array('value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'),
array('value' => '250x250', 'name' => 'Square Button (250px x 250px)'),
array('value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'),
array('value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'),
array('value' => '120x600', 'name' => 'Scyscraper (120px x 600px)')
)
),
array('name' => '----- MOBILE -----', 'values' =>
array(
array('value' => '168x28', 'name' => 'Feature Phone Medium Banner (168px x 28px)'),
array('value' => '216x36', 'name' => 'Feature Phone Large Banner (216px x 36px)'),
array('value' => '300x50', 'name' => 'Smartphone Banner (300px x 50px)'),
array('value' => '320x50', 'name' => 'Smartphone Wide Banner (320px x 50px)')
)
)

],
),
// AT
7 => [
['name' => '----- DESKTOP -----', 'values' =>
[
['value' => '728x90', 'name' => 'Super Banner (728px x 90px)'],
['value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'],
['value' => '250x250', 'name' => 'Square Button (250px x 250px)'],
['value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'],
['value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'],
['value' => '120x600', 'name' => 'Scyscraper (120px x 600px)']
]
],
7 => array(
array('name' => '----- DESKTOP -----', 'values' =>
array(
array('value' => '728x90', 'name' => 'Super Banner (728px x 90px)'),
array('value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'),
array('value' => '250x250', 'name' => 'Square Button (250px x 250px)'),
array('value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'),
array('value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'),
array('value' => '120x600', 'name' => 'Scyscraper (120px x 600px)')
)
),

/**
* mobile sizes not yet available in AT
Expand All @@ -129,19 +129,19 @@ private static function allowedSizes()
['value' => '320x50', 'name' => 'Smartphone Wide Banner (320px x 50px)']
]
]*/
],
),
// CH
6 => [
['name' => '----- DESKTOP -----', 'values' =>
[
['value' => '728x90', 'name' => 'Super Banner (728px x 90px)'],
['value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'],
['value' => '250x250', 'name' => 'Square Button (250px x 250px)'],
['value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'],
['value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'],
['value' => '120x600', 'name' => 'Scyscraper (120px x 600px)']
]
],
6 => array(
array('name' => '----- DESKTOP -----', 'values' =>
array(
array('value' => '728x90', 'name' => 'Super Banner (728px x 90px)'),
array('value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'),
array('value' => '250x250', 'name' => 'Square Button (250px x 250px)'),
array('value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'),
array('value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'),
array('value' => '120x600', 'name' => 'Scyscraper (120px x 600px)')
)
),
/**
* mobile sizes not yet available in CH
**/
Expand All @@ -156,19 +156,19 @@ private static function allowedSizes()
]
*/

],
),
// UK
2 => [
['name' => '----- DESKTOP -----', 'values' =>
[
['value' => '728x90', 'name' => 'Super Banner (728px x 90px)'],
['value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'],
['value' => '250x250', 'name' => 'Square Button (250px x 250px)'],
['value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'],
['value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'],
['value' => '120x600', 'name' => 'Scyscraper (120px x 600px)']
]
],
2 => array(
array('name' => '----- DESKTOP -----', 'values' =>
array(
array('value' => '728x90', 'name' => 'Super Banner (728px x 90px)'),
array('value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'),
array('value' => '250x250', 'name' => 'Square Button (250px x 250px)'),
array('value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'),
array('value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'),
array('value' => '120x600', 'name' => 'Scyscraper (120px x 600px)')
)
),
/**
* mobile sizes not yet available in UK
**/
Expand All @@ -181,43 +181,43 @@ private static function allowedSizes()
['value' => '320x50', 'name' => 'Smartphone Wide Banner (320px x 50px)']
]
]*/
],
),
// FR
3 => [
['name' => '----- DESKTOP -----', 'values' =>
[
['value' => '728x90', 'name' => 'Super Banner (728px x 90px)'],
['value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'],
['value' => '250x250', 'name' => 'Square Button (250px x 250px)'],
['value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'],
['value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'],
['value' => '120x600', 'name' => 'Scyscraper (120px x 600px)'],
['value' => '300x600', 'name' => 'Half Page (300px x 600px)']
]
],
['name' => '----- MOBILE -----', 'values' =>
[
['value' => '168x28', 'name' => 'Feature Phone Medium Banner (168px x 28px)'],
['value' => '216x36', 'name' => 'Feature Phone Large Banner (216px x 36px)'],
['value' => '300x50', 'name' => 'Smartphone Banner (300px x 50px)'],
['value' => '320x50', 'name' => 'Smartphone Wide Banner (320px x 50px)']
]
]
3 => array(
array('name' => '----- DESKTOP -----', 'values' =>
array(
array('value' => '728x90', 'name' => 'Super Banner (728px x 90px)'),
array('value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'),
array('value' => '250x250', 'name' => 'Square Button (250px x 250px)'),
array('value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'),
array('value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'),
array('value' => '120x600', 'name' => 'Scyscraper (120px x 600px)'),
array('value' => '300x600', 'name' => 'Half Page (300px x 600px)')
)
),
array('name' => '----- MOBILE -----', 'values' =>
array(
array('value' => '168x28', 'name' => 'Feature Phone Medium Banner (168px x 28px)'),
array('value' => '216x36', 'name' => 'Feature Phone Large Banner (216px x 36px)'),
array('value' => '300x50', 'name' => 'Smartphone Banner (300px x 50px)'),
array('value' => '320x50', 'name' => 'Smartphone Wide Banner (320px x 50px)')
)
)

],
),
// NL - currently not implemented
4 => [
['name' => '----- DESKTOP -----', 'values' =>
[
['value' => '728x90', 'name' => 'Super Banner (728px x 90px)'],
['value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'],
['value' => '250x250', 'name' => 'Square Button (250px x 250px)'],
['value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'],
['value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'],
['value' => '120x600', 'name' => 'Scyscraper (120px x 600px)'],
['value' => '300x600', 'name' => 'Half Page (300px x 600px)']
]
],
4 => array(
array('name' => '----- DESKTOP -----', 'values' =>
array(
array('value' => '728x90', 'name' => 'Super Banner (728px x 90px)'),
array('value' => '300x250', 'name' => 'Medium Rectangle (300px x 250px)'),
array('value' => '250x250', 'name' => 'Square Button (250px x 250px)'),
array('value' => '468x60', 'name' => 'Fullsize Banner (468px x 60px)'),
array('value' => '160x600', 'name' => 'Wide Scyscraper (160px x 600px)'),
array('value' => '120x600', 'name' => 'Scyscraper (120px x 600px)'),
array('value' => '300x600', 'name' => 'Half Page (300px x 600px)')
)
),
/**
* mobile sizes not yet available in NL
**/
Expand All @@ -231,8 +231,8 @@ private static function allowedSizes()
]
]
*/
]
];
)
);


return $allowedPlatFormSizes[(int)get_option('affilinet_platform', 1)];
Expand Down
Binary file modified languages/affilinet-de_DE.mo
View file
Binary file not shown.
12 changes: 8 additions & 4 deletions languages/affilinet-de_DE.po
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Affilinet Advertising & Content Monetization\n"
"POT-Creation-Date: 2016-10-25 12:06+0200\n"
"PO-Revision-Date: 2016-10-25 12:08+0200\n"
"POT-Creation-Date: 2016-11-17 17:18+0100\n"
"PO-Revision-Date: 2016-11-17 18:55+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: de_DE\n"
Expand Down Expand Up @@ -138,8 +138,9 @@ msgid "Clicks"
msgstr "Klicks"

#: classes/View.php:69
msgid "Confirmed Commission (€)"
msgstr "Bestätigte Provision (€)"
#, fuzzy
msgid "Offene Vergütung"
msgstr "Offene Vergütung"

#: classes/Widget.php:32
msgid "Banner size"
Expand Down Expand Up @@ -271,6 +272,9 @@ msgid ""
msgstr ""
"https://www.affili.net/htmlcontent/de/Publishermodules/WordPress/Start.html"

#~ msgid "Confirmed Commission (€)"
#~ msgstr "Bestätigte Provision (€)"

#~ msgid "Netherlands"
#~ msgstr "Niederlande"

Expand Down
Binary file modified languages/affilinet-fr_FR.mo
View file
Binary file not shown.
11 changes: 7 additions & 4 deletions languages/affilinet-fr_FR.po
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Affilinet Advertising & Content Monetization\n"
"POT-Creation-Date: 2016-10-25 12:06+0200\n"
"PO-Revision-Date: 2016-10-25 12:07+0200\n"
"POT-Creation-Date: 2016-11-24 14:38+0100\n"
"PO-Revision-Date: 2016-11-24 14:42+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
Expand Down Expand Up @@ -137,8 +137,8 @@ msgid "Clicks"
msgstr "Clics"

#: classes/View.php:69
msgid "Confirmed Commission (€)"
msgstr "Gains confirmés (€)"
msgid "Offene Vergütung"
msgstr "Gains en attente"

#: classes/Widget.php:32
msgid "Banner size"
Expand Down Expand Up @@ -269,6 +269,9 @@ msgid ""
msgstr ""
"https://www.affili.net/htmlcontent/fr/Publishermodules/WordPress/Welcome.html"

#~ msgid "Confirmed Commission (€)"
#~ msgstr "Gains confirmés (€)"

#~ msgid "Netherlands"
#~ msgstr "Pays-Bas"

Expand Down
Binary file modified languages/affilinet-nl_NL.mo
View file
Binary file not shown.
Loading

0 comments on commit 06239fd

Please sign in to comment.