Skip to content
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

Proof of concept for #587 (transform placeables) #588

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Proof of concept for #587 (transform placeables) #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion fluent-bundle/src/bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ export type TextTransform = (text: string) => string;
type NativeValue = string | number | Date;
export type FluentVariable = FluentValue | NativeValue;

const noTransform: TextTransform = (
text => text
);

/**
* Message bundles are single-language stores of translation resources. They are
* responsible for formatting message values and attributes to strings.
Expand All @@ -23,6 +27,7 @@ export class FluentBundle {
public _functions: Record<string, FluentFunction>;
public _useIsolating: boolean;
public _transform: TextTransform;
public _transformPlaceable: TextTransform;
public _intls: IntlCache;

/**
Expand Down Expand Up @@ -59,11 +64,13 @@ export class FluentBundle {
{
functions,
useIsolating = true,
transform = (v: string): string => v
transform = noTransform,
transformPlaceable = noTransform,
}: {
functions?: Record<string, FluentFunction>;
useIsolating?: boolean;
transform?: TextTransform;
transformPlaceable?: TextTransform;
} = {}
) {
this.locales = Array.isArray(locales) ? locales : [locales];
Expand All @@ -74,6 +81,7 @@ export class FluentBundle {
};
this._useIsolating = useIsolating;
this._transform = transform;
this._transformPlaceable = transformPlaceable;
this._intls = getMemoizerForLocale(locales);
}

Expand Down
6 changes: 4 additions & 2 deletions fluent-bundle/src/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function resolveVariableReference(
// Convert the argument to a Fluent type.
switch (typeof arg) {
case "string":
return arg;
return scope.bundle._transformPlaceable(arg);
case "number":
return new FluentNumber(arg);
case "object":
Expand Down Expand Up @@ -345,7 +345,9 @@ export function resolveComplexPattern(
result.push(FSI);
}

result.push(resolveExpression(scope, elem).toString(scope));
result.push(
resolveExpression(scope, elem).toString(scope)
);

if (useIsolating) {
result.push(PDI);
Expand Down