framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into grunt

Browse Source
This commit is contained in:
Ben Word
2013-03-17 18:57:43 -05:00
parent 545b125092 9fc2eb7f2f
commit dba3e55e3c
8 changed files with 200 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/rewrites.md
View File

@@ -18,6 +18,8 @@ If HTML5 Boilerplate's `.htaccess` support is enabled in `lib/config.php`, then
### Nginx
Include these in your Nginx config, before the PHP fastcgi block (`location ~ \.php$`).
location ~ ^/assets/(img|js|css)/(.*)$ {
try_files $uri $uri/ /wp-content/themes/roots/assets/$1/$2;
}
@@ -32,4 +34,4 @@ If HTML5 Boilerplate's `.htaccess` support is enabled in `lib/config.php`, then
"^/js/(.*)$" => "/wp-content/themes/roots/js/$1",
"^/img/(.*)$" => "/wp-content/themes/roots/img/$1",
"^/plugins/(.*)$" => "/wp-content/plugins/$1"
)
)

BIN
lang/pt_BR.mo
View File

Binary file not shown.

341
lang/pt_BR.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-08-28 11:22-0300\n"
"POT-Creation-Date: 2013-03-09 22:20-0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Weslly Honorato <weslly.honorato@gmail.com>\n"
"Language-Team: \n"
@@ -10,259 +10,242 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e\n"
"X-Poedit-Basepath: ../\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-SearchPath-1: ./templates\n"
"X-Poedit-SearchPath-2: ./lib\n"
#: 404.php:5
msgid ""
"The page you are looking for might have been removed, had its name changed, "
"or is temporarily unavailable."
msgstr ""
"A página solicitada pode ter sido removida, renomeada ou está "
"temporariamente indisponível."
#: 404.php:4
msgid "Sorry, but the page you were trying to view does not exist."
msgstr "Desculpe-nos, a página que você está tentando acessar não existe."
#: 404.php:8
msgid "Please try the following:"
msgstr "Por favor, tente o seguinte:"
#: 404.php:7
msgid "It looks like this was the result of either:"
msgstr "Provavelmente este foi o resultado de:"
#: 404.php:9
msgid "a mistyped address"
msgstr "um endereço digitado incorretamente"
#: 404.php:10
msgid "Check your spelling"
msgstr "Verifique sua grafia"
msgid "an out-of-date link"
msgstr "um link desatualizado"
#: 404.php:11
#, php-format
msgid "Return to the <a href=\"%s\">home page</a>"
msgstr "Retornar para a <a href=\"%s\">página inicial</a>"
#: 404.php:12
msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
msgstr "Clique no botão <a href=\"javascript:history.back()\">Voltar</a>"
#: functions.php:28
msgid "Primary Navigation"
msgstr "Navegação Primária"
#: lib/activation.php:32 lib/activation.php:33
#: lib/activation.php:33 lib/activation.php:34
msgid "Theme Activation"
msgstr "Ativação do Tema"
#: lib/activation.php:72
#: lib/activation.php:70
#, php-format
msgid "%s Theme Activation"
msgstr "%s Ativação do Tema"
#: lib/activation.php:87 lib/activation.php:89
#: lib/activation.php:85 lib/activation.php:87
msgid "Create static front page?"
msgstr "Criar uma página inicial estática?"
#: lib/activation.php:91 lib/activation.php:104 lib/activation.php:117
#: lib/activation.php:130 lib/activation.php:143
#: lib/activation.php:89 lib/activation.php:102 lib/activation.php:115
#: lib/activation.php:128 lib/activation.php:141
msgid "Yes"
msgstr "Sim"
#: lib/activation.php:92 lib/activation.php:105 lib/activation.php:118
#: lib/activation.php:131 lib/activation.php:144
#: lib/activation.php:90 lib/activation.php:103 lib/activation.php:116
#: lib/activation.php:129 lib/activation.php:142
msgid "No"
msgstr "Não"
#: lib/activation.php:95
#: lib/activation.php:93
msgid "Create a page called Home and set it to be the static front page"
msgstr ""
"Criar uma página chamada Home e configurá-la como a página inicial estática"
#: lib/activation.php:100
#: lib/activation.php:98
msgid "Change permalink structure?"
msgstr "Modificar a estrutura de links permanentes?"
#: lib/activation.php:102
#: lib/activation.php:100
msgid "Update permalink structure?"
msgstr "Atualizar a estrutura de links permanentes?"
#: lib/activation.php:108
#: lib/activation.php:106
msgid "Change permalink structure to /&#37;postname&#37;/"
msgstr "Modificar a estrutura de links permanentes para /&#37;postname&#37;/"
#: lib/activation.php:113
#: lib/activation.php:111
msgid "Change uploads folder?"
msgstr "Modificar a localização da pasta de uploads?"
#: lib/activation.php:115
#: lib/activation.php:113
msgid "Update uploads folder?"
msgstr "Atualizar a pasta de uploads?"
#: lib/activation.php:121
#: lib/activation.php:119
msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
msgstr ""
"Modificar a localização da pasta de uploads para /assets/ em vez de /wp-"
"content/uploads/"
#: lib/activation.php:126 lib/activation.php:128
#: lib/activation.php:124 lib/activation.php:126
msgid "Create navigation menu?"
msgstr "Criar o menu de navegação?"
#: lib/activation.php:134
#: lib/activation.php:132
msgid "Create the Primary Navigation menu and set the location"
msgstr "Criar o menu de navegação primário e atualizar a localização"
#: lib/activation.php:139 lib/activation.php:141
#: lib/activation.php:137 lib/activation.php:139
msgid "Add pages to menu?"
msgstr "Adicionar páginas ao menu?"
#: lib/activation.php:147
#: lib/activation.php:145
msgid "Add all current published pages to the Primary Navigation"
msgstr "Adicionar todas as páginas publicadas ao menu de navegação primária"
#: lib/cleanup.php:404
#: lib/cleanup.php:368
msgid "Continued"
msgstr "Continua"
#: lib/htaccess.php:26
#: lib/comments.php:35
#, php-format
msgid "%1$s"
msgstr "%1$s"
#: lib/comments.php:36
msgid "(Edit)"
msgstr "(Editar)"
#: lib/comments.php:40
msgid "Your comment is awaiting moderation."
msgstr "Seu comentário está aguardando moderação."
#: lib/init.php:11
msgid "Primary Navigation"
msgstr "Navegação Primária"
#: lib/utils.php:60
msgid "Latest Posts"
msgstr "Últimos Posts"
#: lib/utils.php:69
#, php-format
msgid "Daily Archives: %s"
msgstr "Arquivos Diários: %s"
#: lib/utils.php:71
#, php-format
msgid "Monthly Archives: %s"
msgstr "Arquivos Mensais: %s"
#: lib/utils.php:73
#, php-format
msgid "Yearly Archives: %s"
msgstr "Arquivos Anuais: %s"
#: lib/utils.php:75
#, php-format
msgid "Author Archives: %s"
msgstr "Arquivos do Autor: %s"
#: lib/utils.php:80
#, php-format
msgid "Search Results for %s"
msgstr "Resultados da Busca por %s"
#: lib/utils.php:82
msgid "Not Found"
msgstr "Não Encontrado"
#: lib/utils.php:94
#, php-format
msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
msgstr ""
"Por favor, certifique-se de que seu arquivo <a href=\"%s\">.htaccess</a> "
"possui permissão de escrita"
#: lib/template-tags.php:5
#, php-format
msgid "Posted on %s at %s."
msgstr "Publicado em %s às %s."
#: lib/template-tags.php:6
msgid "Written by"
msgstr "Escrito por"
#: lib/widgets.php:6
#: lib/widgets.php:8
msgid "Primary Sidebar"
msgstr "Barra Lateral Primária"
#: lib/widgets.php:14
#: lib/widgets.php:17
msgid "Footer"
msgstr "Rodapé"
#: lib/widgets.php:30
#: lib/widgets.php:45
msgid "Use this widget to add a vCard"
msgstr "Utilize este widget para adicionar um vCard"
#: lib/widgets.php:31
#: lib/widgets.php:47
msgid "Roots: vCard"
msgstr "Roots: vCard"
#: lib/widgets.php:58
#: lib/widgets.php:74
msgid "vCard"
msgstr "vCard"
#: lib/widgets.php:124
msgid "Title (optional):"
msgstr "Título (opcional):"
#: lib/widgets.php:128
msgid "Street Address:"
msgstr "Endereço:"
#: lib/widgets.php:132
msgid "City/Locality:"
msgstr "Cidade/Localização:"
#: lib/widgets.php:136
msgid "State/Region:"
msgstr "Estado/Região:"
#: lib/widgets.php:140
msgid "Zipcode/Postal Code:"
msgstr "CEP/Código Postal:"
#: lib/widgets.php:144
msgid "Telephone:"
msgstr "Telefone:"
#: lib/widgets.php:148
msgid "Email:"
msgstr "Email:"
#: templates/comments.php:7
#, php-format
msgid "<cite class=\"fn\">%s</cite>"
msgstr "<cite class=\"fn\">%s</cite>"
#: templates/comments.php:8
#, php-format
msgid "%1$s"
msgstr "%1$s"
#: templates/comments.php:9
msgid "(Edit)"
msgstr "(Editar)"
#: templates/comments.php:15
msgid "Your comment is awaiting moderation."
msgstr "Seu comentário está aguardando moderação."
#: templates/comments.php:32
msgid "This post is password protected. Enter the password to view comments."
msgstr ""
"Este post é protegido por senha. Digite a senha para visualizar os "
"comentários."
#: templates/comments.php:49
#: templates/comments.php:18
msgid "&larr; Older comments"
msgstr "&larr; Comentários mais antigos"
#: templates/comments.php:50
#: templates/comments.php:21
msgid "Newer comments &rarr;"
msgstr "Comentários mais novos &rarr;"
#: templates/comments.php:58 templates/comments.php:68
#: templates/comments.php:29 templates/comments.php:38
msgid "Comments are closed."
msgstr "Os comentários estão fechados."
#: templates/comments.php:75
#: templates/comments.php:45
msgid "Leave a Reply"
msgstr "Deixar uma Resposta"
#: templates/comments.php:75
#: templates/comments.php:45
#, php-format
msgid "Leave a Reply to %s"
msgstr "Deixar uma resposta para %s"
#: templates/comments.php:78
#: templates/comments.php:48
#, php-format
msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
msgstr ""
"Você precisa estar <a href=\"%s\">logado</a> para postar um comentário."
#: templates/comments.php:82
#: templates/comments.php:53
#, php-format
msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
msgstr "Logado como <a href=\"%s/wp-admin/profile.php\">%s</a>."
#: templates/comments.php:82
#: templates/comments.php:54
msgid "Log out of this account"
msgstr "Sair desta conta"
#: templates/comments.php:82
#: templates/comments.php:54
msgid "Log out &raquo;"
msgstr "Sair &raquo;"
#: templates/comments.php:84
#: templates/comments.php:57
msgid "Name"
msgstr "Nome"
#: templates/comments.php:84 templates/comments.php:86
#: templates/comments.php:57 templates/comments.php:59
msgid " (required)"
msgstr " (obrigatório)"
#: templates/comments.php:86
#: templates/comments.php:59
msgid "Email (will not be published)"
msgstr "Email (não será publicado)"
#: templates/comments.php:88
#: templates/comments.php:61
msgid "Website"
msgstr "Site"
#: templates/comments.php:91
#: templates/comments.php:64
msgid "Comment"
msgstr "Comentar"
#: templates/comments.php:93
#: templates/comments.php:66
msgid "Submit Comment"
msgstr "Enviar Comentário"
@@ -270,50 +253,21 @@ msgstr "Enviar Comentário"
msgid "Pages:"
msgstr "Páginas:"
#: templates/content.php:4
#: templates/content.php:3
msgid "Sorry, no results were found."
msgstr "Desculpe, nenhum resultado foi encontrado."
#: templates/content.php:26
#: templates/content.php:27
msgid "&larr; Older posts"
msgstr "&larr; Posts mais antigos"
#: templates/content.php:27
#: templates/content.php:30
msgid "Newer posts &rarr;"
msgstr "Posts mais novos &rarr;"
#: templates/page-header.php:8
msgid "Latest Posts"
msgstr "Últimos Posts"
#: templates/page-header.php:17
#, php-format
msgid "Daily Archives: %s"
msgstr "Arquivos Diários: %s"
#: templates/page-header.php:19
#, php-format
msgid "Monthly Archives: %s"
msgstr "Arquivos Mensais: %s"
#: templates/page-header.php:21
#, php-format
msgid "Yearly Archives: %s"
msgstr "Arquivos Anuais: %s"
#: templates/page-header.php:25
#, php-format
msgid "Author Archives: %s"
msgstr "Arquivos do Autor: %s"
#: templates/page-header.php:30
#, php-format
msgid "Search Results for %s"
msgstr "Resultados da Busca por %s"
#: templates/page-header.php:32
msgid "File Not Found"
msgstr "Arquivo não encontrado"
#: templates/entry-meta.php:2
msgid "By"
msgstr "Por"
#: templates/searchform.php:2
msgid "Search for:"
@@ -323,6 +277,66 @@ msgstr "Buscar por:"
msgid "Search"
msgstr "Busca"
#~ msgid ""
#~ "The page you are looking for might have been removed, had its name "
#~ "changed, or is temporarily unavailable."
#~ msgstr ""
#~ "A página solicitada pode ter sido removida, renomeada ou está "
#~ "temporariamente indisponível."
#~ msgid "Please try the following:"
#~ msgstr "Por favor, tente o seguinte:"
#~ msgid "Check your spelling"
#~ msgstr "Verifique sua grafia"
#~ msgid "Return to the <a href=\"%s\">home page</a>"
#~ msgstr "Retornar para a <a href=\"%s\">página inicial</a>"
#~ msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
#~ msgstr "Clique no botão <a href=\"javascript:history.back()\">Voltar</a>"
#~ msgid "<cite class=\"fn\">%s</cite>"
#~ msgstr "<cite class=\"fn\">%s</cite>"
#~ msgid ""
#~ "This post is password protected. Enter the password to view comments."
#~ msgstr ""
#~ "Este post é protegido por senha. Digite a senha para visualizar os "
#~ "comentários."
#~ msgid "One Response to &ldquo;%2$s&rdquo;"
#~ msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
#~ msgstr[0] "Uma Resposta para &ldquo;%2$s&rdquo;"
#~ msgstr[1] "%1$s Respostas para &ldquo;%2$s&rdquo;"
#~ msgid "Posted on %s at %s."
#~ msgstr "Publicado em %s às %s."
#~ msgid "Written by"
#~ msgstr "Escrito por"
#~ msgid "Title (optional):"
#~ msgstr "Título (opcional):"
#~ msgid "Street Address:"
#~ msgstr "Endereço:"
#~ msgid "City/Locality:"
#~ msgstr "Cidade/Localização:"
#~ msgid "State/Region:"
#~ msgstr "Estado/Região:"
#~ msgid "Zipcode/Postal Code:"
#~ msgstr "CEP/Código Postal:"
#~ msgid "Telephone:"
#~ msgstr "Telefone:"
#~ msgid "Email:"
#~ msgstr "Email:"
#~ msgid ""
#~ "Please update your <a href=\"%s\">site tagline</a> <a href=\"%s\" style="
#~ "\"float: right;\">Hide Notice</a>"
@@ -372,9 +386,6 @@ msgstr "Busca"
#~ msgid "No Responses to"
#~ msgstr "Nenhuma Resposta para"
#~ msgid "One Response to"
#~ msgstr "Uma Resposta para"
#~ msgid "Pages"
#~ msgstr "Páginas"

18
lib/cleanup.php
View File

@@ -80,6 +80,20 @@ function roots_language_attributes() {
}
add_filter('language_attributes', 'roots_language_attributes');
/**
* Manage output of wp_title()
*/
function roots_wp_title($title) {
if (is_feed()) {
return $title;
}
$title .= get_bloginfo('name');
return $title;
}
add_filter('wp_title', 'roots_wp_title', 10);
/**
* Clean up output of stylesheet <link> tags
*/
@@ -128,7 +142,7 @@ function roots_root_relative_url($input) {
if(!is_admin() && site_url() != home_url() && stristr($input, 'wp-includes') === false) {
$input = str_replace(site_url(), "", $input);
}
$output = preg_replace_callback(
'!(https?://[^/|"]+)([^"]+)?!',
create_function(
@@ -142,7 +156,7 @@ function roots_root_relative_url($input) {
),
$input
);
// detect and correct for subdir installs
if($subdir = parse_url(home_url(), PHP_URL_PATH)) {
if(substr($output, 0, strlen($subdir)) == (substr($output, strlen($subdir), strlen($subdir)))) {

1
lib/config.php
View File

@@ -8,6 +8,7 @@ add_theme_support('h5bp-htaccess'); // Enable HTML5 Boilerplate's .htacc
add_theme_support('bootstrap-top-navbar'); // Enable Bootstrap's top navbar
add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery]
add_theme_support('nice-search'); // Enable /?s= to /search/ redirect
add_theme_support('jquery-cdn'); // Enable to load jQuery from the Google CDN
/**
* Configuration values

2
lib/nav.php
View File

@@ -38,7 +38,7 @@ class Roots_Nav_Walker extends Walker_Nav_Menu {
}
function display_element($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) {
$element->is_dropdown = !empty($children_elements[$element->ID]);
$element->is_dropdown = ((!empty($children_elements[$element->ID]) && (($depth + 1) < $max_depth)));
if ($element->is_dropdown) {
if ($depth === 0) {

6
lib/scripts.php
View File

@@ -22,9 +22,10 @@ function roots_scripts() {
// jQuery is loaded using the same method from HTML5 Boilerplate:
// Grab Google CDN's latest jQuery with a protocol relative URL; fallback to local if offline
// It's kept in the header instead of footer to avoid conflicts with plugins.
if (!is_admin()) {
if (!is_admin() && current_theme_supports('jquery-cdn')) {
wp_deregister_script('jquery');
wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js', false, null, false);
add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
}
if (is_single() && comments_open() && get_option('thread_comments')) {
@@ -54,9 +55,6 @@ function roots_jquery_local_fallback($src, $handle) {
return $src;
}
if (!is_admin()) {
add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
}
function roots_google_analytics() { ?>
<script>

2
templates/head.php
View File

@@ -5,7 +5,7 @@
<!--[if gt IE 8]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->
<head>
<meta charset="utf-8">
<title><?php wp_title(''); ?></title>
<title><?php wp_title('|', true, 'right'); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<?php wp_head(); ?>