Skip to content

French translation - WIP #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 50 commits into from
Aug 18, 2017
Merged

French translation - WIP #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a741474
created file for translation
loichu Aug 17, 2017
be8dc1a
Added french link
loichu Aug 17, 2017
1c02d22
Intro translated
loichu Aug 17, 2017
617179b
Intro translated
loichu Aug 17, 2017
fd46aab
§1
ponsfrilus Aug 17, 2017
703bdbb
§2
ponsfrilus Aug 17, 2017
7d98dce
Titles translated
loichu Aug 17, 2017
2c15ef2
§2.1
ponsfrilus Aug 17, 2017
fb49d70
Fixed tick issue in title star
loichu Aug 17, 2017
eb48921
Fixed tick issue in title star
loichu Aug 17, 2017
940c39b
§2.2
ponsfrilus Aug 17, 2017
9ccfc89
Fixed multilignes link
loichu Aug 17, 2017
108cd99
Organized language choice
loichu Aug 17, 2017
358a696
Merge pull request #1 from ponsfrilus/master
loichu Aug 17, 2017
5284f42
§2.2.1
ponsfrilus Aug 17, 2017
33f9ac3
Merge remote-tracking branch 'upstream/master'
ponsfrilus Aug 17, 2017
9f3d8a0
2.3 => 2.3.1
loichu Aug 17, 2017
f68192c
§2.3.2
ponsfrilus Aug 17, 2017
426c954
§2.3.3
ponsfrilus Aug 17, 2017
ab7a7f5
§2.7
ponsfrilus Aug 17, 2017
e2ee193
2.4 => 2.7
loichu Aug 17, 2017
2b8f78f
Merge branch 'master' into master
loichu Aug 17, 2017
27a837c
Merge pull request #2 from ponsfrilus/master
loichu Aug 17, 2017
508171c
Merge branch 'master' into master
loichu Aug 17, 2017
714107c
Merge remote-tracking branch 'real-upstream/master'
ponsfrilus Aug 17, 2017
38a78f2
Merge branch 'master' into master
ponsfrilus Aug 17, 2017
70825fc
2.8.1
loichu Aug 17, 2017
edf9c50
Merge pull request #3 from ponsfrilus/master
loichu Aug 17, 2017
cc09252
2.8.2 => 4
loichu Aug 17, 2017
6337227
4.2 => 4.3
loichu Aug 18, 2017
d3b6fcd
4.4
loichu Aug 18, 2017
e58ab3a
changed 'Recherche globale' to 'Correspondance globale'
loichu Aug 18, 2017
eaa0577
5.1
loichu Aug 18, 2017
b3d143d
5
loichu Aug 18, 2017
72a99e4
5.1
loichu Aug 18, 2017
ef0453c
5.3
loichu Aug 18, 2017
6644f8c
FINISHED git commit -am 5.3git commit -am 5.3git commit -am 5.3 FUCK …
loichu Aug 18, 2017
a7c7370
corrected typos
loichu Aug 18, 2017
1c410b8
changed modèle for schéma
loichu Aug 18, 2017
6b284a0
corrected typo
loichu Aug 18, 2017
79d2a3e
corrected typo
loichu Aug 18, 2017
2ab3848
corrected typo
loichu Aug 18, 2017
22926b9
corrected typo
loichu Aug 18, 2017
9b160a8
corrected typo
loichu Aug 18, 2017
d1ab8a4
corrected typo
loichu Aug 18, 2017
be503be
corrected typo
loichu Aug 18, 2017
506bd34
corrected typo
loichu Aug 18, 2017
0b8edda
corrected typo
loichu Aug 18, 2017
376cb75
corrected typo
loichu Aug 18, 2017
7963934
Merge branch 'master' of github.com:loichu/learn-regex
loichu Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions README-cn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
## 翻译:

* [English](README.md)
* [Spanish](README-es.md)
* [Español](README-es.md)
* [Français](README-fr.md)
* [中文版](README-cn.md)
* [日本語](README-ja.md)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will great that translation titles menu be in the correct language.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about that. People are more like to recognize their language if written in their mother tongue. It's also the way it's done in wikipedia.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes you are right... I like your answer...

## 什么是正则表达式?

> 正则表达式是一组由字母和符号组成的特殊文本, 它可以用来从文本中找出满足你想要的格式的句子.


Expand Down Expand Up @@ -69,7 +70,7 @@
例如: 一个正则表达式 `the`, 它表示一个规则: 由字母`t`开始,接着是`h`,再接着是`e`.

<pre>
"the" => The fat cat sat on <a href="#learn-regex"><strong>the</strong></a> mat.
"the" => The fat cat sat on <a href="#learn-regex"><strong>the</strong></a> mat.
</pre>

[在线练习](https://regex101.com/r/dmRygT/1)
Expand Down Expand Up @@ -106,7 +107,7 @@

## 2.1 点运算符 `.`

`.`是元字符中最简单的例子.
`.`是元字符中最简单的例子.
`.`匹配任意单个字符, 但不匹配换行符.
例如, 表达式`.ar`匹配一个任意字符后面跟着是`a`和`r`的字符串.

Expand Down Expand Up @@ -152,7 +153,7 @@

## 2.3 重复次数

后面跟着元字符 `+`, `*` or `?` 的, 用来指定匹配子模式的次数.
后面跟着元字符 `+`, `*` or `?` 的, 用来指定匹配子模式的次数.
这些元字符在不同的情况下有着不同的意思.

### 2.3.1 `*` 号
Expand Down Expand Up @@ -218,7 +219,7 @@
我们可以省略第二个参数.
例如, `[0-9]{2,}` 匹配至少两位 0~9 的数字.

如果逗号也省略掉则表示重复固定的次数.
如果逗号也省略掉则表示重复固定的次数.
例如, `[0-9]{3}` 匹配3位数字

<pre>
Expand Down Expand Up @@ -347,7 +348,7 @@
`?=...` 前置约束(存在), 表示第一部分表达式必须跟在 `?=...`定义的表达式之后.

返回结果只瞒住第一部分表达式.
定义一个前置约束(存在)要使用 `()`. 在括号内部使用一个问号和等号: `(?=...)`.
定义一个前置约束(存在)要使用 `()`. 在括号内部使用一个问号和等号: `(?=...)`.

前置约束的内容写在括号中的等号后面.
例如, 表达式 `[T|t]he(?=\sfat)` 匹配 `The` 和 `the`, 在括号中我们又定义了前置约束(存在) `(?=\sfat)` ,即 `The` 和 `the` 后面紧跟着 `(空格)fat`.
Expand All @@ -361,7 +362,7 @@
### 4.2 `?!...` 前置约束-排除

前置约束-排除 `?!` 用于筛选所有匹配结果, 筛选条件为 其后不跟随着定义的格式
`前置约束-排除` 定义和 `前置约束(存在)` 一样, 区别就是 `=` 替换成 `!` 也就是 `(?!...)`.
`前置约束-排除` 定义和 `前置约束(存在)` 一样, 区别就是 `=` 替换成 `!` 也就是 `(?!...)`.

表达式 `[T|t]he(?!\sfat)` 匹配 `The` 和 `the`, 且其后不跟着 `(空格)fat`.

Expand Down Expand Up @@ -423,7 +424,7 @@

### 5.2 全局搜索 (Global search)

修饰符 `g` 常用语执行一个全局搜索匹配, 即(不仅仅返回第一个匹配的, 而是返回全部).
修饰符 `g` 常用语执行一个全局搜索匹配, 即(不仅仅返回第一个匹配的, 而是返回全部).
例如, 表达式 `/.(at)/g` 表示搜索 任意字符(除了换行) + `at`, 并返回全部结果.

<pre>
Expand All @@ -440,7 +441,7 @@

### 5.3 多行修饰符 (Multiline)

多行修饰符 `m` 常用语执行一个多行匹配.
多行修饰符 `m` 常用语执行一个多行匹配.

像之前介绍的 `(^,$)` 用于检查格式是否是在待检测字符串的开头或结尾. 但我们如果想要它在每行的开头和结尾生效, 我们需要用到多行修饰符 `m`.

Expand Down
3 changes: 2 additions & 1 deletion README-es.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
## Translations:

* [English](README.md)
* [Español](README-es.md)
* [Español](README-es.md)
* [Français](README-fr.md)
* [中文版](README-cn.md)
* [日本語](README-ja.md)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will great that translation titles menu be in the correct language. For example here:

Expand Down
Loading