Fixed: key is a MySQL reserved keyword :p
This commit is contained in:
parent
004aa6f700
commit
ca38d1aa17
|
@ -21,7 +21,7 @@ EXPIRE_CHOICES = (
|
||||||
class Language(models.Model):
|
class Language(models.Model):
|
||||||
"""Language object."""
|
"""Language object."""
|
||||||
name = models.CharField(max_length=200, unique=True)
|
name = models.CharField(max_length=200, unique=True)
|
||||||
key = models.CharField(max_length=200, unique=True)
|
slug = models.SlugField(max_length=200, unique=True)
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
"""String representation."""
|
"""String representation."""
|
||||||
|
|
|
@ -12,7 +12,7 @@ def render_pygments(request, paste, data):
|
||||||
if cache_exists(key):
|
if cache_exists(key):
|
||||||
highlighted_content = cache_fetch(key)
|
highlighted_content = cache_fetch(key)
|
||||||
else:
|
else:
|
||||||
lexer = get_lexer_by_name(paste.language.key)
|
lexer = get_lexer_by_name(paste.language.slug)
|
||||||
formatter = get_formatter_by_name('html')
|
formatter = get_formatter_by_name('html')
|
||||||
highlighted_content = highlight(paste.content, lexer, formatter)
|
highlighted_content = highlight(paste.content, lexer, formatter)
|
||||||
cache_store(key, highlighted_content)
|
cache_store(key, highlighted_content)
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
insert into paste_language('name', 'key') values('Bash (shell)', 'bash');
|
INSERT INTO paste_language (name, slug) VALUES ('Bash (shell)', 'bash');
|
||||||
insert into paste_language('name', 'key') values('C#','csharp');
|
INSERT INTO paste_language (name, slug) VALUES ('C#','csharp');
|
||||||
insert into paste_language('name', 'key') values('C','c');
|
INSERT INTO paste_language (name, slug) VALUES ('C','c');
|
||||||
insert into paste_language('name', 'key') values('C++','cpp');
|
INSERT INTO paste_language (name, slug) VALUES ('C++','cpp');
|
||||||
insert into paste_language('name', 'key') values('CSS','css');
|
INSERT INTO paste_language (name, slug) VALUES ('CSS','css');
|
||||||
insert into paste_language('name', 'key') values('Diff','diff');
|
INSERT INTO paste_language (name, slug) VALUES ('Diff','diff');
|
||||||
insert into paste_language('name', 'key') values('Go','go');
|
INSERT INTO paste_language (name, slug) VALUES ('Go','go');
|
||||||
insert into paste_language('name', 'key') values('HTML','html');
|
INSERT INTO paste_language (name, slug) VALUES ('HTML','html');
|
||||||
insert into paste_language('name', 'key') values('Java','java');
|
INSERT INTO paste_language (name, slug) VALUES ('Java','java');
|
||||||
insert into paste_language('name', 'key') values('Javascript','javascript');
|
INSERT INTO paste_language (name, slug) VALUES ('Javascript','javascript');
|
||||||
insert into paste_language('name', 'key') values('Perl','perl');
|
INSERT INTO paste_language (name, slug) VALUES ('Perl','perl');
|
||||||
insert into paste_language('name', 'key') values('PHP','php');
|
INSERT INTO paste_language (name, slug) VALUES ('PHP','php');
|
||||||
insert into paste_language('name', 'key') values('Plain text','text');
|
INSERT INTO paste_language (name, slug) VALUES ('Plain text','text');
|
||||||
insert into paste_language('name', 'key') values('Python','python');
|
INSERT INTO paste_language (name, slug) VALUES ('Python','python');
|
||||||
insert into paste_language('name', 'key') values('Ruby','ruby');
|
INSERT INTO paste_language (name, slug) VALUES ('Ruby','ruby');
|
||||||
insert into paste_language('name', 'key') values('SQL','sql');
|
INSERT INTO paste_language (name, slug) VALUES ('SQL','sql');
|
||||||
insert into paste_language('name', 'key') values('XML','xml');
|
INSERT INTO paste_language (name, slug) VALUES ('XML','xml');
|
||||||
insert into paste_language('name', 'key') values('YAML','yaml');
|
INSERT INTO paste_language (name, slug) VALUES ('YAML','yaml');
|
||||||
|
|
Loading…
Reference in New Issue
Block a user