seal clubbing update

_sakura/changelog.json

@@ -11,7 +11,8 @@
                 "20150427",
                 "20150427.1",
                 "20150427.2",
-                "20150427.3"
+                "20150427.3",
+                "20150427.4"
 
             ]
 
@@ -722,6 +723,19 @@
                 "change":   "Fixed bug in rank checking function (didn't decode the json string)."
             }
 
+        ],
+
+        "20150427.4": [
+
+            {
+                "type":     "FIX",
+                "change":   "Fixed Canada not existing."
+            },
+            {
+                "type":     "FIX",
+                "change":   "Fixed profiles not showing profile data to logged in users."
+            }
+
         ]
 
     }

_sakura/config/iso3166.json

@@ -1,5 +1,5 @@
 {
-    "_CONTRIB": "List of ISO 3166-1 alpha-2 country codes by Flashwave http://flash.moe",
+
     "AD": "Andorra",
     "AE": "United Arab Emirates",
     "AF": "Afghanistan",
@@ -28,7 +28,7 @@
     "BL": "Saint Barthélemy",
     "BM": "Bermuda",
     "BN": "Brunei Darussalam",
-    "BO": "Bolivia, Plurinational State of",
+    "BO": "Plurinational State of Bolivia",
     "BQ": "Bonaire, Sint Eustatius and Saba",
     "BR": "Brazil",
     "BS": "Bahamas",
@@ -37,6 +37,7 @@
     "BW": "Botswana",
     "BY": "Belarus",
     "BZ": "Belize",
+    "CA": "Canada",
     "CC": "Cocos (Keeling) Islands",
     "CD": "Congo, the Democratic Republic of the",
     "CF": "Central African Republic",
@@ -71,7 +72,7 @@
     "FI": "Finland",
     "FJ": "Fiji",
     "FK": "Falkland Islands (Malvinas)",
-    "FM": "Micronesia, Federated States of",
+    "FM": "Federated States of Micronesia",
     "FO": "Faroe Islands",
     "FR": "France",
     "GA": "Gabon",
@@ -106,7 +107,7 @@
     "IN": "India",
     "IO": "British Indian Ocean Territory",
     "IQ": "Iraq",
-    "IR": "Iran, Islamic Republic of",
+    "IR": "Islamic Republic of Iran",
     "IS": "Iceland",
     "IT": "Italy",
     "JE": "Jersey",
@@ -119,8 +120,8 @@
     "KI": "Kiribati",
     "KM": "Comoros",
     "KN": "Saint Kitts and Nevis",
-    "KP": "Korea, Democratic People's Republic of",
+    "KP": "Democratic People's Republic of Korea",
-    "KR": "Korea, Republic of",
+    "KR": "Republic of Korea",
     "KW": "Kuwait",
     "KY": "Cayman Islands",
     "KZ": "Kazakhstan",
@@ -137,12 +138,12 @@
     "LY": "Libya",
     "MA": "Morocco",
     "MC": "Monaco",
-    "MD": "Moldova, Republic of",
+    "MD": "Republic of Moldova",
     "ME": "Montenegro",
     "MF": "Saint Martin",
     "MG": "Madagascar",
     "MH": "Marshall Islands",
-    "MK": "Macedonia, the former Yugoslav Republic of",
+    "MK": "The former Yugoslav Republic of Macedonia",
     "ML": "Mali",
     "MM": "Myanmar",
     "MN": "Mongolia",
@@ -181,7 +182,7 @@
     "PM": "Saint Pierre and Miquelon",
     "PN": "Pitcairn",
     "PR": "Puerto Rico",
-    "PS": "Palestine, State of",
+    "PS": "State of Palestine",
     "PT": "Portugal",
     "PW": "Palau",
     "PY": "Paraguay",
@@ -197,7 +198,7 @@
     "SD": "Sudan",
     "SE": "Sweden",
     "SG": "Singapore",
-    "SH": "Saint Helena, Ascension and Tristan da Cunha",
+    "SH": "Ascension and Tristan da Cunha Saint Helena",
     "SI": "Slovenia",
     "SJ": "Svalbard and Jan Mayen",
     "SK": "Slovakia",
@@ -226,7 +227,7 @@
     "TT": "Trinidad and Tobago",
     "TV": "Tuvalu",
     "TW": "Taiwan, Province of China",
-    "TZ": "Tanzania, United Republic of",
+    "TZ": "United Republic of Tanzania",
     "UA": "Ukraine",
     "UG": "Uganda",
     "UM": "United States Minor Outlying Islands",
@@ -235,7 +236,7 @@
     "UZ": "Uzbekistan",
     "VA": "Holy See (Vatican City State)",
     "VC": "Saint Vincent and the Grenadines",
-    "VE": "Venezuela, Bolivarian Republic of",
+    "VE": "Bolivarian Republic of Venezuela",
     "VG": "Virgin Islands, British",
     "VI": "Virgin Islands, U.S.",
     "VN": "Viet Nam",
@@ -247,4 +248,5 @@
     "ZA": "South Africa",
     "ZM": "Zambia",
     "ZW": "Zimbabwe"
+
 }

_sakura/sakura.php

@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION',    '20150427.3');
+define('SAKURA_VERSION',    '20150427.4');
 define('SAKURA_VLABEL',     'Heliotrope');
 define('SAKURA_VTYPE',      'Development');
 define('SAKURA_COLOUR',     '#DF73FF');

_sakura/templates/yuuno/main/profile.tpl

@@ -23,7 +23,7 @@
                 <b>Last Seen on</b> {{ profile.user.lastdate|date("l Y-m-d H:i T") }}
                 {% if profile.data is not null %}
                 <hr class="default" />
-                {% if user.loggedin %}
+                {% if user.checklogin %}
                 <table style="width: 100%;">
                 {% for name,field in profile.data %}
                 <tr>