Skip to content

Commit

Permalink
Finishing adding github issue tracker, changing license
Browse files Browse the repository at this point in the history
  • Loading branch information
William Alton committed Apr 27, 2012
1 parent 59a3966 commit 811d7d9
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 33 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011 Lachlan Laycock, Chad Jackson, Harry Bernstein, Mathieu Ravaux, Jérémy Van de Wyngaert
Copyright (c) 2011 Lachlan Laycock, Chad Jackson, Harry Bernstein, Mathieu Ravaux, Jérémy Van de Wyngaert, William Alton, Adam Copeland

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/admin.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
%li.nav-dashboard= link_to_unless_current ttt(:'.dashboard'), admin_path
%li.nav-archives= link_to_unless_current ttt(:'.archives'), admin_posts_path
%li.nav-users= link_to_unless_current ttt(:'.users'), admin_users_path
%li.nav-github= link_to_unless_current ttt(:'.github'), admin_github_path
%li.nav-logout= link_to_unless_current ttt(:'.logout'), destroy_user_session_path
%li.nav-search
= semantic_form_for Atreides::Post.new, :url => admin_search_path, :html => {:method => :get, :class => "auto-hide-text", :id => "admin_search"} do |f|
=link_to_function image_tag("admin/search_icon.png")
=text_field_tag "search", (params[:search] || ttt(:'.search'))
- if Atreides::Site.count > 1
%li.nav-site
#site_selector
%label{:for => "site"}
%label{:for => "site"}
Site
.sites
%ol
Expand Down
61 changes: 31 additions & 30 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
en:
model:
states:
en:
model:
states:
drafted: save as a draft
publish_now: publish now
published_at: publish on date

atreides:
atreides:

layouts:
public:
layouts:
public:
go: Go!>>
home: Home
search: search
Expand All @@ -19,22 +19,23 @@ en:
logout: logout
search: search
users: users
github: issues

atreides:
home:
index:
home:
index:
diary: Diary
posts:
show:
arrow_previous: < previous
arrow_next: next >
admin_home:
index:
x_drafts:
admin_home:
index:
x_drafts:
one: 1 draft
other: "%{count} drafts"
zero: no draft
x_posts:
x_posts:
one: 1 post
other: "%{count} posts"
zero: 0 post
Expand Down Expand Up @@ -62,12 +63,12 @@ en:
site_changed: "Site changed to %{current_site}!"

admin:
common:
common:
search_form:
reset: reset

atreides:
comments:
atreides:
comments:
index:
comments: comments
approve: approve
Expand Down Expand Up @@ -96,18 +97,18 @@ en:
spam: spam
deleted: deleted
submit: submit
features:
index:

features:
index:
drafted: Drafted
drag_and_drop_featured_items_to_change_their_display_order: Drag and drop featured items to change their display order.
published: Published
queued: queued
x_features:
x_features:
one: 1 feature
other: "%{count} features"
zero: no feature
form:
form:
caption: caption
choose_a_post: choose a post
existing_post: existing post
Expand All @@ -122,28 +123,28 @@ en:
tags: tags
custom_url: "custom URL"
leave_blank_to_create_automatically: "leave blank to set automatically"
index:
index:
drafts: drafts
published: published
form:
form:
add_inline_photo: + insert photo
custom_url: Custom URL
leave_blank_to_create_automatically: Leave blank to create automatically
parent: Parent
publish_on: Publish on
tags: Tags
posts:
index:
posts:
index:
drafts: drafts
published: published
queued: queued
x_posts:
x_posts:
one: 1 post
other: "%{count} posts"
zero: 0 post
post:
post:
add_inline_photo: + insert photo
form_sidebar:
form_sidebar:
cross_posting: cross posting
crosspost_facebook: Post to Facebook
crosspost_twitter: Post to Twitter
Expand All @@ -158,16 +159,16 @@ en:
content_parts:
text:
add_inline_photo: + insert photo
photos:
photos:
gallery_display: Gallery Display
show_photos_as_a_slideshow_gallery_or_stacked_above_each_other: "Show photos as a slideshow gallery or stacked above each other."
upload_hint: Upload, then reorder and caption photos
videos:
videos:
paste_in_a_URL_to_a_vimeo_or_youtube_video: Paste in a URL to a vimeo or youtube video
reorder_and_caption_videos: Reorder and caption videos
video_url: Video Url
save: save
users:
users:
form:
admin: admin
editor: editor
Expand Down

0 comments on commit 811d7d9

Please sign in to comment.