The official `plain text' language is `txt'.

Expunge the various references to our fictional `plain-text' language.

diff --git a/bin/pastebin.userv b/bin/pastebin.userv
index bc7a914..4d5d4c0 100755 (executable)
--- a/bin/pastebin.userv
+++ b/bin/pastebin.userv
@@ -56,7 +56,7 @@ EOF
   my %o;
   getopts "l:t:", \%o and @ARGV == 0
     or Odin::fail "usage: new [-l LANG] [-t TITLE]";
-  my %p = (title => decode(locale => $o{t}), lang => $o{l} // "plain-text",
+  my %p = (title => decode(locale => $o{t}), lang => $o{l} // "txt",
           content => read_content);
   my $db = Odin::open_db;
   my $c = "";

diff --git a/lib/Odin.pm b/lib/Odin.pm
index e7786f5..52c7dde 100644 (file)
--- a/lib/Odin.pm
+++ b/lib/Odin.pm
@@ -309,7 +309,7 @@ sub delete_shorturl (@) {
 
 our %PASTEBIN_DEFAULTS = (
   title => "(untitled)",
-  lang => "plain-text",
+  lang => "txt",
   content => ""
 );
 our @PASTEBIN_PROPS = keys %PASTEBIN_DEFAULTS;

diff --git a/mason/pastebin/%edit b/mason/pastebin/%edit
index bdf3e27..38cc9c4 100644 (file)
--- a/mason/pastebin/%edit
+++ b/mason/pastebin/%edit
@@ -25,7 +25,7 @@
     <div class="paste-widgets">
 %#
       <label class="invis" for="lang" accesskey="l"><u>L</u>abel</label>
-      <select id="lang" name="lang" default="plain-text">
+      <select id="lang" name="lang" default="txt">
 %     my $lh = $db->selectall_hashref
 %      ("SELECT lang, descr FROM odin_pastebin_lang", "descr");
 %     for my $d (sort { Odin::nice_name $a cmp Odin::nice_name $b }

diff --git a/sql/setup-pastebin.sql b/sql/setup-pastebin.sql
index 9833172..b4e99a1 100644 (file)
--- a/sql/setup-pastebin.sql
+++ b/sql/setup-pastebin.sql
@@ -28,7 +28,7 @@ create table odin_pastebin
         owner varchar(64) not null,
         title varchar(128) not null,
         lang varchar(32) not null
-               default 'plain-text'
+               default 'txt'
                references odin_pastebin_lang (lang)
                        on update cascade
                        on delete set default