Skip to content

Commit b234dad

Browse files
stasmecheran
authored andcommitted
Use "placeholder" consistently; remove mentions of "placeable". (#281)
1 parent 3e20060 commit b234dad

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

spec/message.ebnf

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Selector ::= (Variable '=')? '{' Expression '}'
77
/* Variants and Patterns */
88
Variant ::= VariantKey* Pattern
99
VariantKey ::= String | Nmtoken | '*'
10-
Pattern ::= '[' (Text | Placeable)* ']' /* ws: explicit */
10+
Pattern ::= '[' (Text | Placeholder)* ']' /* ws: explicit */
1111

12-
/* Placeables */
13-
Placeable ::= '{' (Expression | MarkupStart | MarkupEnd)? '}'
12+
/* Placeholders */
13+
Placeholder ::= '{' (Expression | MarkupStart | MarkupEnd)? '}'
1414

1515
/* Expressions */
1616
Expression ::= Operand Annotation? | Annotation

spec/syntax.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
1. [Preamble](#preamble)
2020
1. [Variants](#variants)
2121
1. [Patterns](#patterns)
22-
1. [Placeables](#placeables)
22+
1. [Placeholders](#placeholders)
2323
1. [Expressions](#expressions)
2424
1. [Markup Elements](#markup-elements)
2525
1. [Tokens](#tokens)
@@ -143,7 +143,7 @@ plucking the first name from the object representing a person:
143143

144144
### Markup Elements
145145

146-
A message with two markup-like element placeables, `button` and `link`,
146+
A message with two markup-like element placeholders, `button` and `link`,
147147
which the runtime can use to construct a document tree structure for a UI framework.
148148

149149
[{button}Submit{/button} or {link}cancel{/link}.]
@@ -306,7 +306,7 @@ This serves 3 purposes:
306306
are translatable and which ones are part of the formatting logic definition.
307307

308308
```ebnf
309-
Pattern ::= '[' (Text | Placeable)* ']' /* ws: explicit */
309+
Pattern ::= '[' (Text | Placeholder)* ']' /* ws: explicit */
310310
```
311311

312312
Examples:
@@ -315,12 +315,12 @@ Examples:
315315
[Hello, world!]
316316
```
317317

318-
### Placeables
318+
### Placeholders
319319

320-
A placeable is a placeholder for an expression or an open or close markup element.
320+
Placeholders can contain expressions and markup elements.
321321

322322
```ebnf
323-
Placeable ::= '{' (Expression | MarkupStart | MarkupEnd) '}'
323+
Placeholder ::= '{' (Expression | MarkupStart | MarkupEnd) '}'
324324
```
325325

326326
### Expressions

0 commit comments

Comments
 (0)