[#501 state:open] Squashed many sixapart and movabletype references t…

…hat missed earlier sweeps. There are still more
openmelody · Nov 2, 2010 · 47a1503 · 47a1503
1 parent d2f07d4
commit 47a1503
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 21 deletions.
diff --git a/addons/DePoClean.plugin/templates/atom_feed.mtml b/addons/DePoClean.plugin/templates/atom_feed.mtml
@@ -8,7 +8,7 @@
     <id>tag:<$mt:BlogHost exclude_port="1" encode_xml="1"$>,<$mt:TemplateCreatedOn format="%Y-%m-%d"$>:<$mt:BlogRelativeURL encode_xml="1"$>/<$mt:BlogID$></id>
     <updated><mt:Entries lastn="1"><$mt:EntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></mt:Entries></updated>
     <mt:If tag="BlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:If>
-    <generator uri="http://www.sixapart.com/movabletype/"><$mt:ProductName version="1"$></generator>
+    <generator uri="http://openmelody.org/"><$mt:ProductName version="1"$></generator>
 <mt:Entries lastn="$entry_limit">
 <entry>
     <title><$mt:EntryTitle remove_html="1" encode_xml="1"$></title>

diff --git a/addons/DePoClean.plugin/templates/feed_entry.mtml b/addons/DePoClean.plugin/templates/feed_entry.mtml
@@ -8,7 +8,7 @@
     <id>tag:<$mt:BlogHost exclude_port="1" encode_xml="1"$>,<$mt:Date format="%Y"$>:<$mt:BlogRelativeURL encode_xml="1"$>/<$mt:BlogID$>/<$mt:EntryAtomID$>-</id>
     <updated><mt:Comments lastn="1"><$mt:Date utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></mt:Comments></updated>
     <mt:If tag="BlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:If>
-    <generator uri="http://www.sixapart.com/movabletype/">Movable Type <$mt:Version$></generator>
+    <generator uri="http://openmelody.org/">Movable Type <$mt:Version$></generator>
 <mt:Ignore>
     <entry>
         <id><$mt:EntryAtomID$></id>

diff --git a/addons/DePoClean.plugin/templates/rsd.mtml b/addons/DePoClean.plugin/templates/rsd.mtml
@@ -2,7 +2,7 @@
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
 <service>
 <engineName><$mt:ProductName version="1"$></engineName>
-<engineLink>http://www.sixapart.com/movabletype/</engineLink>
+<engineLink>http://openmelody.org/</engineLink>
 <homePageLink><$mt:BlogURL$></homePageLink>
 <apis>
 <api name="MetaWeblog" preferred="true" apiLink="<$mt:CGIPath$><$mt:XMLRPCScript$>" blogID="<$mt:BlogID$>" />

diff --git a/addons/DePoClean.plugin/templates/rss.mtml b/addons/DePoClean.plugin/templates/rss.mtml
@@ -9,7 +9,7 @@
             <language><$mt:BlogLanguage ietf="1"$></language>
             <copyright>Copyright <$mt:Date format="%Y"$></copyright>
             <lastBuildDate><mt:Entries lastn="1"><$mt:EntryDate format_name="rfc822"$></mt:Entries></lastBuildDate>
-            <generator>http://www.sixapart.com/movabletype/</generator>
+            <generator>http://openmelody.org/</generator>
             <docs>http://www.rssboard.org/rss-specification</docs>
     <mt:Entries lastn="$entry_limit">
             <item>

diff --git a/addons/MultiBlog.plugin/config.yaml b/addons/MultiBlog.plugin/config.yaml
@@ -44,7 +44,7 @@ applications:
             multiblog_add_trigger: $MultiBlog::MultiBlog::CMSMethods::add_trigger
 
 tags:
-    help_url: sub MT->translate(http://www.movabletype.org/documentation/appendices/tags/%t.html) 
+    help_url: sub MT->translate(http://github.com/openmelody/melody/wiki/tags-%t) 
     block:
         Entries: MultiBlog::preprocess_native_tags
         Categories: MultiBlog::preprocess_native_tags

diff --git a/default_templates/feed_recent.mtml b/default_templates/feed_recent.mtml
@@ -6,7 +6,7 @@
     <id>tag:<$mt:BlogHost exclude_port="1" encode_xml="1"$>,<$mt:TemplateCreatedOn format="%Y-%m-%d"$>:<$mt:BlogRelativeURL encode_xml="1"$>/<$mt:BlogID$></id>
     <updated><mt:Entries lastn="1"><$mt:EntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></mt:Entries></updated>
     <mt:If tag="BlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:If>
-    <generator uri="http://www.sixapart.com/movabletype/"><$mt:ProductName version="1"$></generator>
+    <generator uri="http://openmelody.org/"><$mt:ProductName version="1"$></generator>
 <mt:Entries lastn="15">
 <entry>
     <title><$mt:EntryTitle remove_html="1" encode_xml="1"$></title>

diff --git a/default_templates/rsd.mtml b/default_templates/rsd.mtml
@@ -2,7 +2,7 @@
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
 <service>
 <engineName><$mt:ProductName version="1"$></engineName>
-<engineLink>http://www.sixapart.com/movabletype/</engineLink>
+<engineLink>http://openmelody.org/</engineLink>
 <homePageLink><$mt:BlogURL$></homePageLink>
 <apis>
 <api name="MetaWeblog" preferred="true" apiLink="<$mt:CGIPath$><$mt:XMLRPCScript$>" blogID="<$mt:BlogID$>" />

diff --git a/lib/MT.pm b/lib/MT.pm
@@ -41,7 +41,9 @@ BEGIN {
         $SCHEMA_VERSION           = '4.0077';
         $PRODUCT_NAME             = 'Melody';
         $PRODUCT_CODE             = 'OM';
-        $VERSION_ID               = '1.0-beta 1 (27)';
+        $VERSION_ID               = '1.0-beta 1 (build '
+                                    .(split('.', $PRODUCT_VERSION))[2]
+                                    .')';
         $PORTAL_URL               = 'http://openmelody.org';
     }
     else { 
@@ -112,7 +114,7 @@ sub version_slug {
     return MT->translate_templatized(<<"SLUG");
 <__trans phrase="Powered by [_1]" params="$PRODUCT_NAME">
 <__trans phrase="Version [_1]" params="$VERSION_ID">
-<__trans phrase="http://www.sixapart.com/movabletype/">
+<__trans phrase="http://openmelody.org/">
 SLUG
 }
 

diff --git a/lib/MT/Core.pm b/lib/MT/Core.pm
@@ -485,10 +485,9 @@ BEGIN {
             'ShowIPInformation'     => { default => 0, },
             'AllowComments'         => { default => 1, },
             'AllowPings'            => { default => 1, },
-            'HelpURL'               => undef,
-            #'HelpURL'               => {
-            #    default => 'http://www.sixapart.com/movabletype/docs/4.0/',
-            #},
+            'HelpURL'               => {
+               default => 'http://github.com/openmelody/melody/wiki/',
+            },
             'UsePlugins'               => { default => 1, },
             'PluginSwitch'             => { type    => 'HASH', },
             'PluginSchemaVersion'      => { type    => 'HASH', },

diff --git a/lib/MT/I18N/default.pm b/lib/MT/I18N/default.pm
@@ -28,7 +28,7 @@ sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_FROM_EXCERPT ()     { 50 }
 sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_BREAK_UP ()         { 30 }
 
 sub PORTAL_URL()            { '' } # default PORTAL_URL is determined in building packages 
-sub SUPPORT_URL()           { 'http://www.sixapart.com/movabletype/support/' } 
+sub SUPPORT_URL()           { 'http://getsatisfaction.com/openmelody/' } 
 sub NEWS_URL()              { 'http://openmelody.org/blog/' } 
 sub NEWSBOX_URL()           { 'http://openmelody.org/blog/melody_news_widget.html' } 
 sub LEARNINGNEWS_URL()      { 'http://learning.movabletype.org/newsbox.html' } 

diff --git a/lib/MT/Template/ContextHandlers.pm b/lib/MT/Template/ContextHandlers.pm
@@ -28,7 +28,7 @@ sub init_default_filters {}
 
 sub core_tags {
     return {
-        help_url => sub { MT->translate('http://www.movabletype.org/documentation/appendices/tags/%t.html') },
+        help_url => sub { MT->translate('http://github.com/openmelody/melody/wiki/tags-%t' },
         block => {
             'App:Setting' => \&_hdlr_app_setting,
             'App:Widget' => \&_hdlr_app_widget,

diff --git a/lib/MT/Upgrade.pm b/lib/MT/Upgrade.pm
@@ -1977,7 +1977,7 @@ sub seed_database {
     require MT::Entry;
     my $entry = MT::Entry->new;
     $entry->blog_id($blog->id);
-    $entry->title(MT->translate("I just finished installing [_1] [_2]!", MT->product_name, MT->product_version));
+    $entry->title(MT->translate("I just finished installing [_1] [_2]!", MT->product_name, MT->version_id));
     $entry->text(MT->translate("Welcome to my new blog powered by [_1]. This is the first post on my blog and was created for me automatically when I finished the installation process. But that is ok, because I will soon be creating posts of my own!", MT->product_name));
     $entry->author_id($author->id);
     $entry->status(MT::Entry::RELEASE());

diff --git a/search_templates/results_feed.tmpl b/search_templates/results_feed.tmpl
@@ -7,7 +7,7 @@
     <link rel="self" type="application/atom+xml" href="<$MTCGIPath$><$MTSearchScript$>?search=<$MTSearchString$>&amp;Template=<$MTSearchTemplateID$>&amp;IncludeBlogs=<$MTSearchIncludeBlogs$>" />
     <link rel="alternate" type="text/html" href="<$MTCGIPath$><$MTSearchScript$>?IncludeBlogs=<$MTSearchIncludeBlogs$>&amp;search=<$MTSearchString remove_html="1" encode_xml="1"$>" />
     <updated><$MTDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></updated>
-    <generator uri="http://www.sixapart.com/movabletype/"><__trans phrase="Melody [_1]" params="<$MTVersion$>"></generator>
+    <generator uri="http://openmelody.org/"><__trans phrase="Melody [_1]" params="<$MTVersion$>"></generator>
     <opensearch:Query role="request" searchTerms="<$MTSearchString remove_html="1" encode_xml="1"$>" />
     <opensearch:totalResults><$MTSearchResultCount$></opensearch:totalResults>
     <opensearch:startIndex>1</opensearch:startIndex>

diff --git a/tmpl/cms/widget/custom_message.tmpl b/tmpl/cms/widget/custom_message.tmpl
@@ -15,7 +15,7 @@
             &lt;p&gt;<__trans phrase="If you need assistance, try:">&lt;/p&gt;
 
             &lt;p&gt;&lt;a href="<mt:var name="help_url">"><__trans phrase="Melody User Manual">&lt;/a&gt;&lt;br /&gt;
-            &lt;a href="<__trans phrase="http://www.sixapart.com/movabletype/support">"&gt;<__trans phrase="Melody Technical Support">&lt;/a&gt;&lt;br /&gt;
+            &lt;a href="<__trans phrase="http://getsatisfaction.com/openmelody">"&gt;<__trans phrase="Melody Technical Support">&lt;/a&gt;&lt;br /&gt;
             &lt;a href="http://forums.sixapart.com/"&gt;<__trans phrase="Melody Community Forums">&lt;/a&gt;&lt;/p&gt;</mt:if></textarea>
             <div class="actions-bar">
                 <div class="actions-bar-inner pkg actions right">
@@ -49,8 +49,7 @@
             <p><__trans phrase="If you need assistance, try:"></p>
             <p>
                 <a href="<mt:var name="help_url">"><__trans phrase="Melody User Manual"></a><br />
-                <a href="<__trans phrase="http://www.sixapart.com/movabletype/support">"><__trans phrase="Melody Technical Support"></a><br />
-                <a href="http://forums.sixapart.com/"><__trans phrase="Melody Community Forums"></a>
+                <a href="http://getsatisfaction.com/openmelody"><__trans phrase="Melody Community Forums"></a>
             </p>
     </mt:if>
         </div>

diff --git a/tmpl/feeds/feed_chrome.tmpl b/tmpl/feeds/feed_chrome.tmpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="<mt:var name="language_encoding">"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title><mt:var name="feed_title" escape="html"></title>
-  <generator uri="http://www.sixapart.com/movabletype/">Melody</generator>
+  <generator uri="http://openmelody.org/">Melody</generator>
   <link rel="self" href="<mt:var name="feed_self" escape="url">" />
   <link type="text/html" rel="alternate" href="<mt:var name="feed_link" escape="url">" title="<mt:var name="feed_title" escape="html">"/>
   <updated><mt:var name="feed_updated_iso"></updated>