Skip to content

Commit

Permalink
* Include FramaCalc's French Localization.
Browse files Browse the repository at this point in the history
  /cc @framasoft - please let me know if it's reasonable to
  credit your derivative work under Artistic License 2.0,
  i.e. same as socialcalcconstants.js.

  Closes #227
  • Loading branch information
audreyt committed Jun 7, 2015
1 parent 653faeb commit 4298880
Show file tree
Hide file tree
Showing 3 changed files with 595 additions and 2 deletions.
5 changes: 4 additions & 1 deletion README.mkdn
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ Deletes a spreadsheet's content after N seconds of inactivity. Activities includ

* socialcalcspreadsheetcontrol.js
* socialcalctableeditor.js
* images/*

### Artistic License 2.0 (Socialtext Inc.)

Expand All @@ -100,6 +99,10 @@ Deletes a spreadsheet's content after N seconds of inactivity. Activities includ
* socialcalcconstants.js
* socialcalcpopup.js

#### Artistic License 2.0 (Framasoft)

* l10n/fr.json

### MIT License (John Resig, The Dojo Foundation)

* static/jquery.js
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
SocialCalc.Constants[k] = data[k];
}
}
$.ajax({url: ("/l10n/" + navigator.language + ".json").replace(/de_\w+/, 'de').replace(/zh-Hant/i, 'zh-TW'),
$.ajax({url: ("/l10n/" + navigator.language + ".json").replace(/de_\w+/, 'de').replace(/zh-Hant/i, 'zh-TW').replace(/fr_\w+/, 'fr'),
async: false,
success: function(data){readl10nfile(data)},
error: function() {
Expand Down
Loading

0 comments on commit 4298880

Please sign in to comment.