[Piwik-svn] r473 - in trunk: lang modules modules/Visualization plugins/Dashboard plugins/Login/templates plugins/SitesManager plugins/UserCountry plugins/UserCountry/lang
svnmaster at piwik.org
svnmaster at piwik.org
Fri May 9 02:46:43 CEST 2008
Author: matt
Date: 2008-05-09 02:46:42 +0200 (Fri, 09 May 2008)
New Revision: 473
Modified:
trunk/lang/en.php
trunk/modules/LogStats.php
trunk/modules/Visualization/Sparkline.php
trunk/plugins/Dashboard/Dashboard.php
trunk/plugins/Login/templates/header.tpl
trunk/plugins/SitesManager/API.php
trunk/plugins/UserCountry/API.php
trunk/plugins/UserCountry/lang/en.php
Log:
- tiny cleaning
Modified: trunk/lang/en.php
===================================================================
--- trunk/lang/en.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/lang/en.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -1,8 +1,4 @@
-<?php
-
-// sets locale for dates, always use UTF-8!
-setlocale(LC_TIME, 'en_US.UTF-8');
-
+<?php
$translations = array(
'General_Unknown' => 'Unknown',
'General_Required' => '%s required',
@@ -27,7 +23,8 @@
'General_VBarGraph' => 'Vertial bar graph',
'General_GraphData' => 'Graph data',
'General_Refresh' => 'Refresh the page',
- 'General_ColumnNbUniqVisitors' => 'Unique visitors',
- 'General_ColumnNbVisits' => 'Visits',
+ 'General_ColumnNbUniqVisitors' => 'Unique visitors',
+ 'General_ColumnNbVisits' => 'Visits',
'General_ColumnLabel' => 'Label',
-);
+ 'General_Save' => 'Save',
+);
\ No newline at end of file
Modified: trunk/modules/LogStats.php
===================================================================
--- trunk/modules/LogStats.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/modules/LogStats.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -210,7 +210,7 @@
case self::STATE_NO_GET_VARIABLE:
printDebug("No get variables => piwik page");
- echo "Piwik is a free open source <a href='http://piwik.org'>web analytics</a> alternative to Google analytics.";
+ echo "<a href='index.php'>Piwik</a> is a free open source <a href='http://piwik.org'>web analytics</a> alternative to Google analytics.";
break;
Modified: trunk/modules/Visualization/Sparkline.php
===================================================================
--- trunk/modules/Visualization/Sparkline.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/modules/Visualization/Sparkline.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -66,21 +66,16 @@
$i++;
}
-// echo imagefontwidth(FONT_2);exit;
- // set y-bound, min and max extent lines
- //
$sparkline->SetYMin(0);
-// $sparkline->SetYMax($max);
$sparkline->SetPadding(2); // setpadding is additive
$sparkline->SetPadding(0,//13,//font height
- 3,//4 * (strlen("$last[1]")),
+ 3, //4 * (strlen("$last[1]")),
0, //imagefontheight(FONT_2),
0);
$font = FONT_2;
- $sparkline->SetFeaturePoint($min[0]-1,$min[1],'red', 5);//, $min[1], TEXT_TOP,$font);
- $sparkline->SetFeaturePoint($max[0]-1,$max[1], 'green', 5);//, $max[1], TEXT_TOP,$font);
- $sparkline->SetFeaturePoint($last[0]-1, $last[1], 'blue',5);//, " $last[1]", TEXT_RIGHT,$font);
-
+ $sparkline->SetFeaturePoint($min[0]-1,$min[1],'red', 5);
+ $sparkline->SetFeaturePoint($max[0]-1,$max[1], 'green', 5);
+ $sparkline->SetFeaturePoint($last[0]-1, $last[1], 'blue',5);
$sparkline->SetLineSize(3); // for renderresampled, linesize is on virtual image
$sparkline->RenderResampled(100, 20, 'lineColor');
Modified: trunk/plugins/Dashboard/Dashboard.php
===================================================================
--- trunk/plugins/Dashboard/Dashboard.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/plugins/Dashboard/Dashboard.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -31,7 +31,7 @@
$sql = "CREATE TABLE ". Piwik::prefixTable('user_dashboard')." (
login VARCHAR( 20 ) NOT NULL ,
iddashboard INT NOT NULL ,
- layout TINYTEXT NOT NULL,
+ layout TEXT NOT NULL,
PRIMARY KEY ( login , iddashboard )
) " ;
Piwik_Query($sql);
Modified: trunk/plugins/Login/templates/header.tpl
===================================================================
--- trunk/plugins/Login/templates/header.tpl 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/plugins/Login/templates/header.tpl 2008-05-09 00:46:42 UTC (rev 473)
@@ -7,7 +7,11 @@
{literal}
<script type="text/javascript">
function focusit() {
- document.getElementById('form_login').focus();
+ var formLogin = document.getElementById('form_login');
+ if(formLogin)
+ {
+ formLogin.focus();
+ }
}
window.onload = focusit;
</script>
Modified: trunk/plugins/SitesManager/API.php
===================================================================
--- trunk/plugins/SitesManager/API.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/plugins/SitesManager/API.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -65,9 +65,7 @@
static public function getSiteFromId( $idSite )
{
Piwik::checkUserHasViewAccess( $idSite );
-
- $db = Zend_Registry::get('db');
- $site = $db->fetchRow("SELECT * FROM ".Piwik::prefixTable("site")." WHERE idsite = ?", $idSite);
+ $site = Zend_Registry::get('db')->fetchRow("SELECT * FROM ".Piwik::prefixTable("site")." WHERE idsite = ?", $idSite);
return $site;
}
@@ -95,10 +93,8 @@
static public function getSiteUrlsFromId( $idSite )
{
Piwik::checkUserHasViewAccess($idSite);
-
$site = self::getSiteFromId($idSite);
$urls = self::getAliasSiteUrlsFromId($idSite);
-
return array_merge(array($site['main_url']), $urls);
}
@@ -110,10 +106,7 @@
static public function getAllSitesId()
{
Piwik::checkUserIsSuperUser();
-
- $db = Zend_Registry::get('db');
- $idSites = $db->fetchCol("SELECT idsite FROM ".Piwik::prefixTable('site'));
- return $idSites;
+ return Zend_Registry::get('db')->fetchCol("SELECT idsite FROM ".Piwik::prefixTable('site'));
}
@@ -126,7 +119,6 @@
static public function getSitesWithAdminAccess()
{
$sitesId = self::getSitesIdWithAdminAccess();
-
return self::getSitesFromIds($sitesId);
}
@@ -139,7 +131,6 @@
static public function getSitesWithViewAccess()
{
$sitesId = self::getSitesIdWithViewAccess();
-
return self::getSitesFromIds($sitesId);
}
@@ -152,7 +143,6 @@
static public function getSitesWithAtLeastViewAccess()
{
$sitesId = self::getSitesIdWithAtLeastViewAccess();
-
return self::getSitesFromIds($sitesId);
}
@@ -176,8 +166,7 @@
*/
static public function getSitesIdWithViewAccess()
{
- $sitesId = Zend_Registry::get('access')->getSitesIdWithViewAccess();
- return $sitesId;
+ return Zend_Registry::get('access')->getSitesIdWithViewAccess();
}
/**
@@ -188,8 +177,7 @@
*/
static public function getSitesIdWithAtLeastViewAccess()
{
- $sitesId = Zend_Registry::get('access')->getSitesIdWithAtLeastViewAccess();
- return $sitesId;
+ return Zend_Registry::get('access')->getSitesIdWithAtLeastViewAccess();
}
/**
Modified: trunk/plugins/UserCountry/API.php
===================================================================
--- trunk/plugins/UserCountry/API.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/plugins/UserCountry/API.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -8,11 +8,8 @@
*
* @package Piwik_UserCountry
*/
-
-
require_once "DataFiles/Countries.php";
-
/**
*
* @package Piwik_UserCountry
@@ -91,7 +88,7 @@
return Piwik_Translate('General_Unknown');
}
- return Piwik_Translate('continent_'. $label);
+ return Piwik_Translate('UserCountry_continent_'. $label);
}
function Piwik_CountryTranslate($label)
{
@@ -100,5 +97,5 @@
return Piwik_Translate('General_Unknown');
}
- return Piwik_Translate('country_'. $label);
-}
\ No newline at end of file
+ return Piwik_Translate('UserCountry_country_'. $label);
+}
Modified: trunk/plugins/UserCountry/lang/en.php
===================================================================
--- trunk/plugins/UserCountry/lang/en.php 2008-05-09 00:36:27 UTC (rev 472)
+++ trunk/plugins/UserCountry/lang/en.php 2008-05-09 00:46:42 UTC (rev 473)
@@ -9,262 +9,262 @@
'UserCountry_WidgetCountries' => 'Visitor countries',
// Countries
- 'country_ac' => 'Ascension Islands',
- 'country_ad' => 'Andorra',
- 'country_ae' => 'United Arab Emirates',
- 'country_af' => 'Afghanistan',
- 'country_ag' => 'Antigua and Barbuda',
- 'country_ai' => 'Anguilla',
- 'country_al' => 'Albania',
- 'country_am' => 'Armenia',
- 'country_an' => 'Netherlands Antilles',
- 'country_ao' => 'Angola',
- 'country_aq' => 'Antarctica',
- 'country_ar' => 'Argentina',
- 'country_as' => 'American Samoa',
- 'country_at' => 'Austria',
- 'country_au' => 'Australia',
- 'country_aw' => 'Aruba',
- 'country_az' => 'Azerbaijan',
- 'country_ba' => 'Bosnia and Herzegovina',
- 'country_bb' => 'Barbados',
- 'country_bd' => 'Bangladesh',
- 'country_be' => 'Belgium',
- 'country_bf' => 'Burkina Faso',
- 'country_bg' => 'Bulgaria',
- 'country_bh' => 'Bahrain',
- 'country_bi' => 'Burundi',
- 'country_bj' => 'Benin',
- 'country_bm' => 'Bermuda',
- 'country_bn' => 'Bruneo',
- 'country_bo' => 'Bolivia',
- 'country_br' => 'Brazil',
- 'country_bs' => 'Bahamas',
- 'country_bt' => 'Bhutan',
- 'country_bv' => 'Bouvet Island',
- 'country_bw' => 'Botswana',
- 'country_by' => 'Belarus',
- 'country_bz' => 'Belize',
- 'country_ca' => 'Canada',
- 'country_cc' => 'Cocos (Keeling) Islands',
- 'country_cd' => 'Congo, The Democratic Republic of the',
- 'country_cf' => 'Central African Republic',
- 'country_cg' => 'Congo',
- 'country_ch' => 'Switzerland',
- 'country_ci' => "Cote D'Ivoire",
- 'country_ck' => 'Cook Islands',
- 'country_cl' => 'Chile',
- 'country_cm' => 'Cameroon',
- 'country_cn' => 'China',
- 'country_co' => 'Colombia',
- 'country_cr' => 'Costa Rica',
- 'country_cs' => 'Serbia Montenegro',
- 'country_cu' => 'Cuba',
- 'country_cv' => 'Cape Verde',
- 'country_cx' => 'Christmas Island',
- 'country_cy' => 'Cyprus',
- 'country_cz' => 'Czech Republic',
- 'country_de' => 'Germany',
- 'country_dj' => 'Djibouti',
- 'country_dk' => 'Denmark',
- 'country_dm' => 'Dominica',
- 'country_do' => 'Dominican Republic',
- 'country_dz' => 'Algeria',
- 'country_ec' => 'Ecuador',
- 'country_ee' => 'Estonia',
- 'country_eg' => 'Egypt',
- 'country_eh' => 'Western Sahara',
- 'country_er' => 'Eritrea',
- 'country_es' => 'Spain',
- 'country_et' => 'Ethiopia',
- 'country_fi' => 'Finland',
- 'country_fj' => 'Fiji',
- 'country_fk' => 'Falkland Islands (Malvinas)',
- 'country_fm' => 'Micronesia, Federated States of',
- 'country_fo' => 'Faroe Islands',
- 'country_fr' => 'France',
- 'country_ga' => 'Gabon',
- 'country_gd' => 'Grenada',
- 'country_ge' => 'Georgia',
- 'country_gf' => 'French Guyana',
- 'country_gg' => 'Guernsey',
- 'country_gh' => 'Ghana',
- 'country_gi' => 'Gibraltar',
- 'country_gl' => 'Greenland',
- 'country_gm' => 'Gambia',
- 'country_gn' => 'Guinea',
- 'country_gp' => 'Guadeloupe',
- 'country_gq' => 'Equatorial Guinea',
- 'country_gr' => 'Greece',
- 'country_gs' => 'South Georgia and the South Sandwich Islands',
- 'country_gt' => 'Guatemala',
- 'country_gu' => 'Guam',
- 'country_gw' => 'Guinea-Bissau',
- 'country_gy' => 'Guyana',
- 'country_hk' => 'Hong Kong',
- 'country_hm' => 'Heard Island and McDonald Islands',
- 'country_hn' => 'Honduras',
- 'country_hr' => 'Croatia',
- 'country_ht' => 'Haiti',
- 'country_hu' => 'Hungary',
- 'country_id' => 'Indonesia',
- 'country_ie' => 'Ireland',
- 'country_il' => 'Israel',
- 'country_im' => 'Man Island',
- 'country_in' => 'India',
- 'country_io' => 'British Indian Ocean Territory',
- 'country_iq' => 'Iraq',
- 'country_ir' => 'Iran, Islamic Republic of',
- 'country_is' => 'Iceland',
- 'country_it' => 'Italy',
- 'country_je' => 'Jersey',
- 'country_jm' => 'Jamaica',
- 'country_jo' => 'Jordan',
- 'country_jp' => 'Japan',
- 'country_ke' => 'Kenya',
- 'country_kg' => 'Kyrgyzstan',
- 'country_kh' => 'Cambodia',
- 'country_ki' => 'Kiribati',
- 'country_km' => 'Comoros',
- 'country_kn' => 'Saint Kitts and Nevis',
- 'country_kp' => "Korea, Democratic People's Republic of",
- 'country_kr' => 'Korea, Republic of',
- 'country_kw' => 'Kuwait',
- 'country_ky' => 'Cayman Islands',
- 'country_kz' => 'Kazakhstan',
- 'country_la' => 'Laos',
- 'country_lb' => 'Lebanon',
- 'country_lc' => 'Saint Lucia',
- 'country_li' => 'Liechtenstein',
- 'country_lk' => 'Sri Lanka',
- 'country_lr' => 'Liberia',
- 'country_ls' => 'Lesotho',
- 'country_lt' => 'Lithuania',
- 'country_lu' => 'Luxembourg',
- 'country_lv' => 'Latvia',
- 'country_ly' => 'Libya',
- 'country_ma' => 'Morocco',
- 'country_mc' => 'Monaco',
- 'country_md' => 'Moldova, Republic of',
- 'country_mg' => 'Madagascar',
- 'country_mh' => 'Marshall Islands',
- 'country_mk' => 'Macedonia',
- 'country_ml' => 'Mali',
- 'country_mm' => 'Myanmar',
- 'country_mn' => 'Mongolia',
- 'country_mo' => 'Macau',
- 'country_mp' => 'Northern Mariana Islands',
- 'country_mq' => 'Martinique',
- 'country_mr' => 'Mauritania',
- 'country_ms' => 'Montserrat',
- 'country_mt' => 'Malta',
- 'country_mu' => 'Mauritius',
- 'country_mv' => 'Maldives',
- 'country_mw' => 'Malawi',
- 'country_mx' => 'Mexico',
- 'country_my' => 'Malaysia',
- 'country_mz' => 'Mozambique',
- 'country_na' => 'Namibia',
- 'country_nc' => 'New Caledonia',
- 'country_ne' => 'Niger',
- 'country_nf' => 'Norfolk Island',
- 'country_ng' => 'Nigeria',
- 'country_ni' => 'Nicaragua',
- 'country_nl' => 'Netherlands',
- 'country_no' => 'Norway',
- 'country_np' => 'Nepal',
- 'country_nr' => 'Nauru',
- 'country_nu' => 'Niue',
- 'country_nz' => 'New Zealand',
- 'country_om' => 'Oman',
- 'country_pa' => 'Panama',
- 'country_pe' => 'Peru',
- 'country_pf' => 'French Polynesia',
- 'country_pg' => 'Papua New Guinea',
- 'country_ph' => 'Philippines',
- 'country_pk' => 'Pakistan',
- 'country_pl' => 'Poland',
- 'country_pm' => 'Saint Pierre and Miquelon',
- 'country_pn' => 'Pitcairn',
- 'country_pr' => 'Puerto Rico',
- 'country_ps' => 'Palestinian Territory',
- 'country_pt' => 'Portugal',
- 'country_pw' => 'Palau',
- 'country_py' => 'Paraguay',
- 'country_qa' => 'Qatar',
- 'country_re' => 'Reunion Island',
- 'country_ro' => 'Romania',
- 'country_ru' => 'Russian Federation',
- 'country_rs' => 'Russia',
- 'country_rw' => 'Rwanda',
- 'country_sa' => 'Saudi Arabia',
- 'country_sb' => 'Solomon Islands',
- 'country_sc' => 'Seychelles',
- 'country_sd' => 'Sudan',
- 'country_se' => 'Sweden',
- 'country_sg' => 'Singapore',
- 'country_sh' => 'Saint Helena',
- 'country_si' => 'Slovenia',
- 'country_sj' => 'Svalbard',
- 'country_sk' => 'Slovakia',
- 'country_sl' => 'Sierra Leone',
- 'country_sm' => 'San Marino',
- 'country_sn' => 'Senegal',
- 'country_so' => 'Somalia',
- 'country_sr' => 'Suriname',
- 'country_st' => 'Sao Tome and Principe',
- 'country_su' => 'Old U.S.S.R',
- 'country_sv' => 'El Salvador',
- 'country_sy' => 'Syrian Arab Republic',
- 'country_sz' => 'Swaziland',
- 'country_tc' => 'Turks and Caicos Islands',
- 'country_td' => 'Chad',
- 'country_tf' => 'French Southern Territories',
- 'country_tg' => 'Togo',
- 'country_th' => 'Thailand',
- 'country_tj' => 'Tajikistan',
- 'country_tk' => 'Tokelau',
- 'country_tm' => 'Turkmenistan',
- 'country_tn' => 'Tunisia',
- 'country_to' => 'Tonga',
- 'country_tp' => 'East Timor',
- 'country_tr' => 'Turkey',
- 'country_tt' => 'Trinidad and Tobago',
- 'country_tv' => 'Tuvalu',
- 'country_tw' => 'Taiwan',
- 'country_tz' => 'Tanzania, United Republic of',
- 'country_ua' => 'Ukraine',
- 'country_ug' => 'Uganda',
- 'country_uk' => 'United Kingdom',
- 'country_gb' => 'Great Britain',
- 'country_um' => 'United States Minor Outlying Islands',
- 'country_us' => 'United States',
- 'country_uy' => 'Uruguay',
- 'country_uz' => 'Uzbekistan',
- 'country_va' => 'Vatican City',
- 'country_vc' => 'Saint Vincent and the Grenadines',
- 'country_ve' => 'Venezuela',
- 'country_vg' => 'Virgin Islands, British',
- 'country_vi' => 'Virgin Islands, U.S.',
- 'country_vn' => 'Vietnam',
- 'country_vu' => 'Vanuatu',
- 'country_wf' => 'Wallis and Futuna',
- 'country_ws' => 'Samoa',
- 'country_ye' => 'Yemen',
- 'country_yt' => 'Mayotte',
- 'country_yu' => 'Yugoslavia',
- 'country_za' => 'South Africa',
- 'country_zm' => 'Zambia',
- 'country_zr' => 'Zaire',
- 'country_zw' => 'Zimbabwe',
+ 'UserCountry_country_ac' => 'Ascension Islands',
+ 'UserCountry_country_ad' => 'Andorra',
+ 'UserCountry_country_ae' => 'United Arab Emirates',
+ 'UserCountry_country_af' => 'Afghanistan',
+ 'UserCountry_country_ag' => 'Antigua and Barbuda',
+ 'UserCountry_country_ai' => 'Anguilla',
+ 'UserCountry_country_al' => 'Albania',
+ 'UserCountry_country_am' => 'Armenia',
+ 'UserCountry_country_an' => 'Netherlands Antilles',
+ 'UserCountry_country_ao' => 'Angola',
+ 'UserCountry_country_aq' => 'Antarctica',
+ 'UserCountry_country_ar' => 'Argentina',
+ 'UserCountry_country_as' => 'American Samoa',
+ 'UserCountry_country_at' => 'Austria',
+ 'UserCountry_country_au' => 'Australia',
+ 'UserCountry_country_aw' => 'Aruba',
+ 'UserCountry_country_az' => 'Azerbaijan',
+ 'UserCountry_country_ba' => 'Bosnia and Herzegovina',
+ 'UserCountry_country_bb' => 'Barbados',
+ 'UserCountry_country_bd' => 'Bangladesh',
+ 'UserCountry_country_be' => 'Belgium',
+ 'UserCountry_country_bf' => 'Burkina Faso',
+ 'UserCountry_country_bg' => 'Bulgaria',
+ 'UserCountry_country_bh' => 'Bahrain',
+ 'UserCountry_country_bi' => 'Burundi',
+ 'UserCountry_country_bj' => 'Benin',
+ 'UserCountry_country_bm' => 'Bermuda',
+ 'UserCountry_country_bn' => 'Bruneo',
+ 'UserCountry_country_bo' => 'Bolivia',
+ 'UserCountry_country_br' => 'Brazil',
+ 'UserCountry_country_bs' => 'Bahamas',
+ 'UserCountry_country_bt' => 'Bhutan',
+ 'UserCountry_country_bv' => 'Bouvet Island',
+ 'UserCountry_country_bw' => 'Botswana',
+ 'UserCountry_country_by' => 'Belarus',
+ 'UserCountry_country_bz' => 'Belize',
+ 'UserCountry_country_ca' => 'Canada',
+ 'UserCountry_country_cc' => 'Cocos (Keeling) Islands',
+ 'UserCountry_country_cd' => 'Congo, The Democratic Republic of the',
+ 'UserCountry_country_cf' => 'Central African Republic',
+ 'UserCountry_country_cg' => 'Congo',
+ 'UserCountry_country_ch' => 'Switzerland',
+ 'UserCountry_country_ci' => "Cote D'Ivoire",
+ 'UserCountry_country_ck' => 'Cook Islands',
+ 'UserCountry_country_cl' => 'Chile',
+ 'UserCountry_country_cm' => 'Cameroon',
+ 'UserCountry_country_cn' => 'China',
+ 'UserCountry_country_co' => 'Colombia',
+ 'UserCountry_country_cr' => 'Costa Rica',
+ 'UserCountry_country_cs' => 'Serbia Montenegro',
+ 'UserCountry_country_cu' => 'Cuba',
+ 'UserCountry_country_cv' => 'Cape Verde',
+ 'UserCountry_country_cx' => 'Christmas Island',
+ 'UserCountry_country_cy' => 'Cyprus',
+ 'UserCountry_country_cz' => 'Czech Republic',
+ 'UserCountry_country_de' => 'Germany',
+ 'UserCountry_country_dj' => 'Djibouti',
+ 'UserCountry_country_dk' => 'Denmark',
+ 'UserCountry_country_dm' => 'Dominica',
+ 'UserCountry_country_do' => 'Dominican Republic',
+ 'UserCountry_country_dz' => 'Algeria',
+ 'UserCountry_country_ec' => 'Ecuador',
+ 'UserCountry_country_ee' => 'Estonia',
+ 'UserCountry_country_eg' => 'Egypt',
+ 'UserCountry_country_eh' => 'Western Sahara',
+ 'UserCountry_country_er' => 'Eritrea',
+ 'UserCountry_country_es' => 'Spain',
+ 'UserCountry_country_et' => 'Ethiopia',
+ 'UserCountry_country_fi' => 'Finland',
+ 'UserCountry_country_fj' => 'Fiji',
+ 'UserCountry_country_fk' => 'Falkland Islands (Malvinas)',
+ 'UserCountry_country_fm' => 'Micronesia, Federated States of',
+ 'UserCountry_country_fo' => 'Faroe Islands',
+ 'UserCountry_country_fr' => 'France',
+ 'UserCountry_country_ga' => 'Gabon',
+ 'UserCountry_country_gd' => 'Grenada',
+ 'UserCountry_country_ge' => 'Georgia',
+ 'UserCountry_country_gf' => 'French Guyana',
+ 'UserCountry_country_gg' => 'Guernsey',
+ 'UserCountry_country_gh' => 'Ghana',
+ 'UserCountry_country_gi' => 'Gibraltar',
+ 'UserCountry_country_gl' => 'Greenland',
+ 'UserCountry_country_gm' => 'Gambia',
+ 'UserCountry_country_gn' => 'Guinea',
+ 'UserCountry_country_gp' => 'Guadeloupe',
+ 'UserCountry_country_gq' => 'Equatorial Guinea',
+ 'UserCountry_country_gr' => 'Greece',
+ 'UserCountry_country_gs' => 'South Georgia and the South Sandwich Islands',
+ 'UserCountry_country_gt' => 'Guatemala',
+ 'UserCountry_country_gu' => 'Guam',
+ 'UserCountry_country_gw' => 'Guinea-Bissau',
+ 'UserCountry_country_gy' => 'Guyana',
+ 'UserCountry_country_hk' => 'Hong Kong',
+ 'UserCountry_country_hm' => 'Heard Island and McDonald Islands',
+ 'UserCountry_country_hn' => 'Honduras',
+ 'UserCountry_country_hr' => 'Croatia',
+ 'UserCountry_country_ht' => 'Haiti',
+ 'UserCountry_country_hu' => 'Hungary',
+ 'UserCountry_country_id' => 'Indonesia',
+ 'UserCountry_country_ie' => 'Ireland',
+ 'UserCountry_country_il' => 'Israel',
+ 'UserCountry_country_im' => 'Man Island',
+ 'UserCountry_country_in' => 'India',
+ 'UserCountry_country_io' => 'British Indian Ocean Territory',
+ 'UserCountry_country_iq' => 'Iraq',
+ 'UserCountry_country_ir' => 'Iran, Islamic Republic of',
+ 'UserCountry_country_is' => 'Iceland',
+ 'UserCountry_country_it' => 'Italy',
+ 'UserCountry_country_je' => 'Jersey',
+ 'UserCountry_country_jm' => 'Jamaica',
+ 'UserCountry_country_jo' => 'Jordan',
+ 'UserCountry_country_jp' => 'Japan',
+ 'UserCountry_country_ke' => 'Kenya',
+ 'UserCountry_country_kg' => 'Kyrgyzstan',
+ 'UserCountry_country_kh' => 'Cambodia',
+ 'UserCountry_country_ki' => 'Kiribati',
+ 'UserCountry_country_km' => 'Comoros',
+ 'UserCountry_country_kn' => 'Saint Kitts and Nevis',
+ 'UserCountry_country_kp' => "Korea, Democratic People's Republic of",
+ 'UserCountry_country_kr' => 'Korea, Republic of',
+ 'UserCountry_country_kw' => 'Kuwait',
+ 'UserCountry_country_ky' => 'Cayman Islands',
+ 'UserCountry_country_kz' => 'Kazakhstan',
+ 'UserCountry_country_la' => 'Laos',
+ 'UserCountry_country_lb' => 'Lebanon',
+ 'UserCountry_country_lc' => 'Saint Lucia',
+ 'UserCountry_country_li' => 'Liechtenstein',
+ 'UserCountry_country_lk' => 'Sri Lanka',
+ 'UserCountry_country_lr' => 'Liberia',
+ 'UserCountry_country_ls' => 'Lesotho',
+ 'UserCountry_country_lt' => 'Lithuania',
+ 'UserCountry_country_lu' => 'Luxembourg',
+ 'UserCountry_country_lv' => 'Latvia',
+ 'UserCountry_country_ly' => 'Libya',
+ 'UserCountry_country_ma' => 'Morocco',
+ 'UserCountry_country_mc' => 'Monaco',
+ 'UserCountry_country_md' => 'Moldova, Republic of',
+ 'UserCountry_country_mg' => 'Madagascar',
+ 'UserCountry_country_mh' => 'Marshall Islands',
+ 'UserCountry_country_mk' => 'Macedonia',
+ 'UserCountry_country_ml' => 'Mali',
+ 'UserCountry_country_mm' => 'Myanmar',
+ 'UserCountry_country_mn' => 'Mongolia',
+ 'UserCountry_country_mo' => 'Macau',
+ 'UserCountry_country_mp' => 'Northern Mariana Islands',
+ 'UserCountry_country_mq' => 'Martinique',
+ 'UserCountry_country_mr' => 'Mauritania',
+ 'UserCountry_country_ms' => 'Montserrat',
+ 'UserCountry_country_mt' => 'Malta',
+ 'UserCountry_country_mu' => 'Mauritius',
+ 'UserCountry_country_mv' => 'Maldives',
+ 'UserCountry_country_mw' => 'Malawi',
+ 'UserCountry_country_mx' => 'Mexico',
+ 'UserCountry_country_my' => 'Malaysia',
+ 'UserCountry_country_mz' => 'Mozambique',
+ 'UserCountry_country_na' => 'Namibia',
+ 'UserCountry_country_nc' => 'New Caledonia',
+ 'UserCountry_country_ne' => 'Niger',
+ 'UserCountry_country_nf' => 'Norfolk Island',
+ 'UserCountry_country_ng' => 'Nigeria',
+ 'UserCountry_country_ni' => 'Nicaragua',
+ 'UserCountry_country_nl' => 'Netherlands',
+ 'UserCountry_country_no' => 'Norway',
+ 'UserCountry_country_np' => 'Nepal',
+ 'UserCountry_country_nr' => 'Nauru',
+ 'UserCountry_country_nu' => 'Niue',
+ 'UserCountry_country_nz' => 'New Zealand',
+ 'UserCountry_country_om' => 'Oman',
+ 'UserCountry_country_pa' => 'Panama',
+ 'UserCountry_country_pe' => 'Peru',
+ 'UserCountry_country_pf' => 'French Polynesia',
+ 'UserCountry_country_pg' => 'Papua New Guinea',
+ 'UserCountry_country_ph' => 'Philippines',
+ 'UserCountry_country_pk' => 'Pakistan',
+ 'UserCountry_country_pl' => 'Poland',
+ 'UserCountry_country_pm' => 'Saint Pierre and Miquelon',
+ 'UserCountry_country_pn' => 'Pitcairn',
+ 'UserCountry_country_pr' => 'Puerto Rico',
+ 'UserCountry_country_ps' => 'Palestinian Territory',
+ 'UserCountry_country_pt' => 'Portugal',
+ 'UserCountry_country_pw' => 'Palau',
+ 'UserCountry_country_py' => 'Paraguay',
+ 'UserCountry_country_qa' => 'Qatar',
+ 'UserCountry_country_re' => 'Reunion Island',
+ 'UserCountry_country_ro' => 'Romania',
+ 'UserCountry_country_ru' => 'Russian Federation',
+ 'UserCountry_country_rs' => 'Russia',
+ 'UserCountry_country_rw' => 'Rwanda',
+ 'UserCountry_country_sa' => 'Saudi Arabia',
+ 'UserCountry_country_sb' => 'Solomon Islands',
+ 'UserCountry_country_sc' => 'Seychelles',
+ 'UserCountry_country_sd' => 'Sudan',
+ 'UserCountry_country_se' => 'Sweden',
+ 'UserCountry_country_sg' => 'Singapore',
+ 'UserCountry_country_sh' => 'Saint Helena',
+ 'UserCountry_country_si' => 'Slovenia',
+ 'UserCountry_country_sj' => 'Svalbard',
+ 'UserCountry_country_sk' => 'Slovakia',
+ 'UserCountry_country_sl' => 'Sierra Leone',
+ 'UserCountry_country_sm' => 'San Marino',
+ 'UserCountry_country_sn' => 'Senegal',
+ 'UserCountry_country_so' => 'Somalia',
+ 'UserCountry_country_sr' => 'Suriname',
+ 'UserCountry_country_st' => 'Sao Tome and Principe',
+ 'UserCountry_country_su' => 'Old U.S.S.R',
+ 'UserCountry_country_sv' => 'El Salvador',
+ 'UserCountry_country_sy' => 'Syrian Arab Republic',
+ 'UserCountry_country_sz' => 'Swaziland',
+ 'UserCountry_country_tc' => 'Turks and Caicos Islands',
+ 'UserCountry_country_td' => 'Chad',
+ 'UserCountry_country_tf' => 'French Southern Territories',
+ 'UserCountry_country_tg' => 'Togo',
+ 'UserCountry_country_th' => 'Thailand',
+ 'UserCountry_country_tj' => 'Tajikistan',
+ 'UserCountry_country_tk' => 'Tokelau',
+ 'UserCountry_country_tm' => 'Turkmenistan',
+ 'UserCountry_country_tn' => 'Tunisia',
+ 'UserCountry_country_to' => 'Tonga',
+ 'UserCountry_country_tp' => 'East Timor',
+ 'UserCountry_country_tr' => 'Turkey',
+ 'UserCountry_country_tt' => 'Trinidad and Tobago',
+ 'UserCountry_country_tv' => 'Tuvalu',
+ 'UserCountry_country_tw' => 'Taiwan',
+ 'UserCountry_country_tz' => 'Tanzania, United Republic of',
+ 'UserCountry_country_ua' => 'Ukraine',
+ 'UserCountry_country_ug' => 'Uganda',
+ 'UserCountry_country_uk' => 'United Kingdom',
+ 'UserCountry_country_gb' => 'Great Britain',
+ 'UserCountry_country_um' => 'United States Minor Outlying Islands',
+ 'UserCountry_country_us' => 'United States',
+ 'UserCountry_country_uy' => 'Uruguay',
+ 'UserCountry_country_uz' => 'Uzbekistan',
+ 'UserCountry_country_va' => 'Vatican City',
+ 'UserCountry_country_vc' => 'Saint Vincent and the Grenadines',
+ 'UserCountry_country_ve' => 'Venezuela',
+ 'UserCountry_country_vg' => 'Virgin Islands, British',
+ 'UserCountry_country_vi' => 'Virgin Islands, U.S.',
+ 'UserCountry_country_vn' => 'Vietnam',
+ 'UserCountry_country_vu' => 'Vanuatu',
+ 'UserCountry_country_wf' => 'Wallis and Futuna',
+ 'UserCountry_country_ws' => 'Samoa',
+ 'UserCountry_country_ye' => 'Yemen',
+ 'UserCountry_country_yt' => 'Mayotte',
+ 'UserCountry_country_yu' => 'Yugoslavia',
+ 'UserCountry_country_za' => 'South Africa',
+ 'UserCountry_country_zm' => 'Zambia',
+ 'UserCountry_country_zr' => 'Zaire',
+ 'UserCountry_country_zw' => 'Zimbabwe',
// Continents
- 'continent_eur' => 'Europe',
- 'continent_afr' => 'Africa',
- 'continent_asi' => 'Asia',
- 'continent_ams' => 'South and Central America',
- 'continent_amn' => 'North America',
- 'continent_oce' => 'Oceania',
+ 'UserCountry_continent_eur' => 'Europe',
+ 'UserCountry_continent_afr' => 'Africa',
+ 'UserCountry_continent_asi' => 'Asia',
+ 'UserCountry_continent_ams' => 'South and Central America',
+ 'UserCountry_continent_amn' => 'North America',
+ 'UserCountry_continent_oce' => 'Oceania',
);
More information about the Piwik-svn
mailing list