Skip to content

Commit 2ca47fe

Browse files
authored
Merge pull request andywer#47 from carestad/laravel-5
Support case-based replacements in Lang functions
2 parents 96926cf + 5814d16 commit 2ca47fe

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

public/js/localization.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/localization.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,21 @@
1818
for (var replacementName in replacements) {
1919
var replacement = replacements[replacementName];
2020

21-
var regex = new RegExp(':'+replacementName, 'g');
22-
message = message.replace(regex, replacement);
21+
// 'welcome' => 'Welcome, :name' => 'Welcome, dayle'
22+
message = message.replace(
23+
new RegExp(':' + replacementName, 'g'),
24+
replacement
25+
);
26+
// 'welcome' => 'Welcome, :NAME' => 'Welcome, DAYLE'
27+
message = message.replace(
28+
new RegExp(':' + replacementName.toUpperCase(), 'g'),
29+
replacement.toUpperCase()
30+
);
31+
// 'welcome' => 'Welcome, :Name' => 'Welcome, Dayle'
32+
message = message.replace(
33+
new RegExp(':' + (replacementName.charAt(0).toUpperCase() + replacementName.substr(1)), 'g'),
34+
replacement.charAt(0).toUpperCase() + replacement.substr(1)
35+
);
2336
}
2437

2538
return message;

resources/views/head.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
@section('js-localization.head')
2-
<script type="text/javascript" src="{{ url('/js-localization/localization.js') }}"></script>
3-
<script type="text/javascript" src="{{ url('/js-localization/messages') }}"></script>
2+
<script src="{{ url('/js-localization/localization.js') }}"></script>
3+
<script src="{{ url('/js-localization/messages') }}"></script>
44

55
@if(Config::get('js-localization.config'))
6-
<script type="text/javascript" src="{{ url('/js-localization/config') }}"></script>
6+
<script src="{{ url('/js-localization/config') }}"></script>
77
@endif
88

9-
<script type="text/javascript">
9+
<script>
1010
Lang.setLocale("{{ App::getLocale() }}");
1111
</script>
1212
@stop
1313

1414
@section('js-localization.head.all_in_one')
15-
<script type="text/javascript" src="{{ url('/js-localization/all.js') }}"></script>
16-
<script type="text/javascript">
15+
<script src="{{ url('/js-localization/all.js') }}"></script>
16+
<script>
1717
Lang.setLocale("{{ App::getLocale() }}");
1818
</script>
1919
@stop

0 commit comments

Comments
 (0)