Skip to content
This repository has been archived by the owner on May 2, 2019. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'bai/syntax-error-fix' into test_bai
Browse files Browse the repository at this point in the history 
Conflicts:
	es/omegat-Benzirpi.tmx
	pt-br/07-customizing-git/01-chapter7.markdown
	ru/07-customizing-git/01-chapter7.markdown

Manually merged pull request #213
Added to the fix ko, nl, no-nb, fr, es, zh, ru, pt-br
  • Loading branch information
@jnavila
jnavila committed Nov 1, 2012
2 parents 3d2fe20 + a911247 commit 22e4de0
Show file tree
Hide file tree
Showing 20 changed files with 43 additions and 42 deletions.
4 changes: 2 additions & 2 deletions ar/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions ca/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions cs/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions de/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -938,8 +938,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions en/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions es-ni/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions es/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -670,8 +670,8 @@ Utilizando la estructura ACL devuelta por el método 'get_acl_access_data' y com
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
8 changes: 4 additions & 4 deletions es/omegat-Benzirpi.tmx
View file
Expand Up @@ -2059,8 +2059,8 @@ Figura 4-9.</seg>
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand All @@ -2081,8 +2081,8 @@ Figura 4-9.</seg>
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions fr/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -953,8 +953,8 @@ Chaque fichier des *commits* doit être vérifié par rapport à la structure AC
next if chemin.size == 0
acces_permis = false
acces[$utilisateur].each do |chemin_acces|
if !chemin_acces # l'utilisateur a un accès complet
|| (chemin.index(chemin_acces) == 0) # acces à ce chemin
if !chemin_acces || # l'utilisateur a un accès complet
(chemin.index(chemin_acces) == 0) # acces à ce chemin
acces_permis = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions ja/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -734,8 +734,8 @@ SHA-1 値がわかっているときにコミットからコミットメッセ
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions ko/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -735,8 +735,8 @@ update 스크립트는 각 브랜치마다 한 번씩 실행된다는 것을 제
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions mk/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions nl/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ Als je gebruik maakt van de ACL struktuur die wordt teruggegeven door de `get_ac
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # gebruiker heeft overal toegang tot
|| (path.index(access_path) == 0) # toegang tot dit pad
if !access_path || # gebruiker heeft overal toegang tot
(path.index(access_path) == 0) # toegang tot dit pad
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions no-nb/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
5 changes: 3 additions & 2 deletions pt-br/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -720,6 +720,7 @@ Se você usar a estrutura ACL retornada pelo método `get_acl_access_data` e ver
def check_directory_perms
access = get_acl_access_data('acl')


# see if anyone is trying to push something they can't
new_commits = `git rev-list #{$oldrev}..#{$newrev}`.split("\n")
new_commits.each do |rev|
Expand All @@ -728,8 +729,8 @@ Se você usar a estrutura ACL retornada pelo método `get_acl_access_data` e ver
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions ru/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -734,8 +734,8 @@ Insert 18333fig0703.png
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # пользователь имеет полный доступ
|| (path.index(access_path) == 0) # доступ к этому пути
if !access_path || # пользователь имеет полный доступ
(path.index(access_path) == 0) # доступ к этому пути
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions th/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions tr/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions zh-tw/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -677,8 +677,8 @@ A simple way to get the commit message from a commit when you have the SHA-1 val
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # user has access to everything
|| (path.index(access_path) == 0) # access to this path
if !access_path || # user has access to everything
(path.index(access_path) == 0) # access to this path
has_file_access = true
end
end
Expand Down
4 changes: 2 additions & 2 deletions zh/07-customizing-git/01-chapter7.markdown
View file
Expand Up @@ -672,8 +672,8 @@ update 脚本和 `pre-receive` 脚本十分类似。不同之处在于它会为
next if path.size == 0
has_file_access = false
access[$user].each do |access_path|
if !access_path # 用户拥有完全访问权限
|| (path.index(access_path) == 0) # 或者对此位置有访问权限
if !access_path || # 用户拥有完全访问权限
(path.index(access_path) == 0) # 或者对此位置有访问权限
has_file_access = true
end
end
Expand Down

0 comments on commit 22e4de0

Please sign in to comment.