Change name of MapPoint property from state to region to avoid conflict with asset state. Add template i18n. Fixes bugs 11531, 11532

docs/changelog/7.x.x.txt

@@ -13,6 +13,8 @@
  - fixed #11525: Paste assets inside CS
  - added #620: Add buttons to the GalleryAlbum edit view so users can rotate photos by 90 deg (Bernd Kalbfuß-Zimmermann)
  - fixed #11530: account deactivation not working (United Knowledge)
+ - fixed #11531: MapPoint property conflict
+ - fixed #11532: MapPoint, no i18n
 
 7.9.2
  - added: Workflow to extend recurring Calendar events 2 years from the

docs/upgrades/upgrade_7.9.2-7.9.3.pl

@@ -32,6 +32,7 @@ my $session = start(); # this line required
 
 reindexSiteForDefaultSynopsis( $session );
 addTopLevelWikiKeywords( $session );
+renameMapPointStateColumn( $session );
 
 finish($session); # this line required
 
@@ -45,6 +46,17 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+sub renameMapPointStateColumn {
+    my $session = shift;
+    print "\tRename the MapPoint column state to region... " unless $quiet;
+
+    $session->db->write('ALTER TABLE MapPoint CHANGE state region char(35)');
+
+    print "Done.\n" unless $quiet;
+}
+
+
 #----------------------------------------------------------------------------
 sub addTopLevelWikiKeywords {
     my $session = shift;

lib/WebGUI/Asset/MapPoint.pm

@@ -99,7 +99,7 @@ sub definition {
             label       => $i18n->get("city label"),
             hoverHelp   => $i18n->get("city description"),
         },
-        state => {
+        region => {
             tab         => "properties",
             fieldType   => "text",
             label       => $i18n->get("state label"),