Skip to content
This repository
Browse code

Merge remote-tracking branch 'bai/syntax-error-fix' into test_bai

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...
commit 22e4de0e14a523a6f482589511cddc445ea69685 2 parents 3d2fe20 + a911247
Jean-Noël Avila authored
4  ar/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # user has access to everything
676  
-	          || (path.index(access_path) == 0) # access to this path
  675
+	        if !access_path || # user has access to everything
  676
+	          (path.index(access_path) == 0) # access to this path
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  ca/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # user has access to everything
676  
-	          || (path.index(access_path) == 0) # access to this path
  675
+	        if !access_path || # user has access to everything
  676
+	          (path.index(access_path) == 0) # access to this path
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  cs/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # user has access to everything
676  
-	          || (path.index(access_path) == 0) # access to this path
  675
+	        if !access_path || # user has access to everything
  676
+	          (path.index(access_path) == 0) # access to this path
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  de/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -938,8 +938,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
938 938
 	      next if path.size == 0
939 939
 	      has_file_access = false
940 940
 	      access[$user].each do |access_path|
941  
-	        if !access_path  # user has access to everything
942  
-	          || (path.index(access_path) == 0) # access to this path
  941
+	        if !access_path || # user has access to everything
  942
+	          (path.index(access_path) == 0) # access to this path
943 943
 	          has_file_access = true 
944 944
 	        end
945 945
 	      end
4  en/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
734 734
 	      next if path.size == 0
735 735
 	      has_file_access = false
736 736
 	      access[$user].each do |access_path|
737  
-	        if !access_path  # user has access to everything
738  
-	          || (path.index(access_path) == 0) # access to this path
  737
+	        if !access_path || # user has access to everything
  738
+	          (path.index(access_path) == 0) # access to this path
739 739
 	          has_file_access = true 
740 740
 	        end
741 741
 	      end
4  es-ni/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # user has access to everything
676  
-	          || (path.index(access_path) == 0) # access to this path
  675
+	        if !access_path || # user has access to everything
  676
+	          (path.index(access_path) == 0) # access to this path
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  es/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -670,8 +670,8 @@ Utilizando la estructura ACL devuelta por el método 'get_acl_access_data' y com
670 670
 	      next if path.size == 0
671 671
 	      has_file_access = false
672 672
 	      access[$user].each do |access_path|
673  
-	        if !access_path  # user has access to everything
674  
-	          || (path.index(access_path) == 0) # access to this path
  673
+	        if !access_path || # user has access to everything
  674
+	          (path.index(access_path) == 0) # access to this path
675 675
 	          has_file_access = true 
676 676
 	        end
677 677
 	      end
8  es/omegat-Benzirpi.tmx
@@ -2059,8 +2059,8 @@ Figura 4-9.</seg>
2059 2059
 	      next if path.size == 0
2060 2060
 	      has_file_access = false
2061 2061
 	      access[$user].each do |access_path|
2062  
-	        if !access_path  # user has access to everything
2063  
-	          || (path.index(access_path) == 0) # access to this path
  2062
+	        if !access_path || # user has access to everything
  2063
+	          (path.index(access_path) == 0) # access to this path
2064 2064
 	          has_file_access = true 
2065 2065
 	        end
2066 2066
 	      end
@@ -2081,8 +2081,8 @@ Figura 4-9.</seg>
2081 2081
 	      next if path.size == 0
2082 2082
 	      has_file_access = false
2083 2083
 	      access[$user].each do |access_path|
2084  
-	        if !access_path  # user has access to everything
2085  
-	          || (path.index(access_path) == 0) # access to this path
  2084
+	        if !access_path || # user has access to everything
  2085
+	          (path.index(access_path) == 0) # access to this path
2086 2086
 	          has_file_access = true 
2087 2087
 	        end
2088 2088
 	      end
4  fr/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -953,8 +953,8 @@ Chaque fichier des *commits* doit être vérifié par rapport à la structure AC
953 953
 	      next if chemin.size == 0
954 954
 	      acces_permis = false
955 955
 	      acces[$utilisateur].each do |chemin_acces|
956  
-	        if !chemin_acces  # l'utilisateur a un accès complet
957  
-	          || (chemin.index(chemin_acces) == 0) # acces à ce chemin
  956
+	        if !chemin_acces || # l'utilisateur a un accès complet
  957
+	          (chemin.index(chemin_acces) == 0) # acces à ce chemin
958 958
 	          acces_permis = true
959 959
 	        end
960 960
 	      end
4  ja/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -734,8 +734,8 @@ SHA-1 値がわかっているときにコミットからコミットメッセ
734 734
 	      next if path.size == 0
735 735
 	      has_file_access = false
736 736
 	      access[$user].each do |access_path|
737  
-	        if !access_path  # user has access to everything
738  
-	          || (path.index(access_path) == 0) # access to this path
  737
+	        if !access_path || # user has access to everything
  738
+	          (path.index(access_path) == 0) # access to this path
739 739
 	          has_file_access = true 
740 740
 	        end
741 741
 	      end
4  ko/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -735,8 +735,8 @@ update 스크립트는 각 브랜치마다 한 번씩 실행된다는 것을 제
735 735
 	      next if path.size == 0
736 736
 	      has_file_access = false
737 737
 	      access[$user].each do |access_path|
738  
-	        if !access_path  # user has access to everything
739  
-	          || (path.index(access_path) == 0) # access to this path
  738
+	        if !access_path || # user has access to everything
  739
+	          (path.index(access_path) == 0) # access to this path
740 740
 	          has_file_access = true
741 741
 	        end
742 742
 	      end
4  mk/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # user has access to everything
676  
-	          || (path.index(access_path) == 0) # access to this path
  675
+	        if !access_path || # user has access to everything
  676
+	          (path.index(access_path) == 0) # access to this path
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  nl/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ Als je gebruik maakt van de ACL struktuur die wordt teruggegeven door de `get_ac
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # gebruiker heeft overal toegang tot
676  
-	          || (path.index(access_path) == 0) # toegang tot dit pad
  675
+	        if !access_path || # gebruiker heeft overal toegang tot
  676
+	          (path.index(access_path) == 0) # toegang tot dit pad
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  no-nb/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
734 734
 	      next if path.size == 0
735 735
 	      has_file_access = false
736 736
 	      access[$user].each do |access_path|
737  
-	        if !access_path  # user has access to everything
738  
-	          || (path.index(access_path) == 0) # access to this path
  737
+	        if !access_path || # user has access to everything
  738
+	          (path.index(access_path) == 0) # access to this path
739 739
 	          has_file_access = true 
740 740
 	        end
741 741
 	      end
5  pt-br/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -720,6 +720,7 @@ Se você usar a estrutura ACL retornada pelo método `get_acl_access_data` e ver
720 720
     def check_directory_perms
721 721
       access = get_acl_access_data('acl')
722 722
 
  723
+
723 724
       # see if anyone is trying to push something they can't
724 725
       new_commits = `git rev-list #{$oldrev}..#{$newrev}`.split("\n")
725 726
       new_commits.each do |rev|
@@ -728,8 +729,8 @@ Se você usar a estrutura ACL retornada pelo método `get_acl_access_data` e ver
728 729
           next if path.size == 0
729 730
           has_file_access = false
730 731
           access[$user].each do |access_path|
731  
-            if !access_path  # user has access to everything
732  
-              || (path.index(access_path) == 0) # access to this path
  732
+            if !access_path || # user has access to everything
  733
+              (path.index(access_path) == 0) # access to this path
733 734
               has_file_access = true
734 735
             end
735 736
           end
4  ru/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -734,8 +734,8 @@ Insert 18333fig0703.png
734 734
 	      next if path.size == 0
735 735
 	      has_file_access = false
736 736
 	      access[$user].each do |access_path|
737  
-	        if !access_path  # пользователь имеет полный доступ
738  
-	          || (path.index(access_path) == 0) # доступ к этому пути
  737
+	        if !access_path || # пользователь имеет полный доступ
  738
+	          (path.index(access_path) == 0) # доступ к этому пути
739 739
 	          has_file_access = true 
740 740
 	        end
741 741
 	      end
4  th/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # user has access to everything
676  
-	          || (path.index(access_path) == 0) # access to this path
  675
+	        if !access_path || # user has access to everything
  676
+	          (path.index(access_path) == 0) # access to this path
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end
4  tr/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -734,8 +734,8 @@ If you use the ACL structure returned from the `get_acl_access_data` method and
734 734
 	      next if path.size == 0
735 735
 	      has_file_access = false
736 736
 	      access[$user].each do |access_path|
737  
-	        if !access_path  # user has access to everything
738  
-	          || (path.index(access_path) == 0) # access to this path
  737
+	        if !access_path || # user has access to everything
  738
+	          (path.index(access_path) == 0) # access to this path
739 739
 	          has_file_access = true 
740 740
 	        end
741 741
 	      end
4  zh-tw/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -677,8 +677,8 @@ A simple way to get the commit message from a commit when you have the SHA-1 val
677 677
 	      next if path.size == 0
678 678
 	      has_file_access = false
679 679
 	      access[$user].each do |access_path|
680  
-	        if !access_path  # user has access to everything
681  
-	          || (path.index(access_path) == 0) # access to this path
  680
+	        if !access_path || # user has access to everything
  681
+	          (path.index(access_path) == 0) # access to this path
682 682
 	          has_file_access = true 
683 683
 	        end
684 684
 	      end
4  zh/07-customizing-git/01-chapter7.markdown
Source Rendered
@@ -672,8 +672,8 @@ update 脚本和 `pre-receive` 脚本十分类似。不同之处在于它会为
672 672
 	      next if path.size == 0
673 673
 	      has_file_access = false
674 674
 	      access[$user].each do |access_path|
675  
-	        if !access_path  # 用户拥有完全访问权限
676  
-	          || (path.index(access_path) == 0) # 或者对此位置有访问权限
  675
+	        if !access_path || # 用户拥有完全访问权限
  676
+	          (path.index(access_path) == 0) # 或者对此位置有访问权限
677 677
 	          has_file_access = true 
678 678
 	        end
679 679
 	      end

0 notes on commit 22e4de0

Please sign in to comment.
Something went wrong with that request. Please try again.