Skip to content

Commit

Permalink
Merge branch 'master' into morizotter/carthage-compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
morizotter committed Aug 1, 2015
2 parents e47abc4 + 10c66a0 commit 8191f1e
Show file tree
Hide file tree
Showing 9 changed files with 466 additions and 31 deletions.
6 changes: 6 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,9 @@ mjanda added es and cs short format strings https://github.com/mjanda
Niklas Fahl added the de short format strings https://github.com/fahlout

Vlad Cacuic added the ro short format strings https://github.com/vrcaciuc

frin added sl Slovenian strings. http://github.com/frin

Nikhil Nigade added hi (Hindi) and gu (Gujarati) strings. https://github.com/dezinezync

Faiz Mokhtar added ms Malay strings. https://github.com/faizmokhtar
20 changes: 10 additions & 10 deletions DateTools/DTConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@

#import <Foundation/Foundation.h>

static const long long SECONDS_IN_YEAR = 31556900;
static const NSInteger SECONDS_IN_MONTH_28 = 2419200;
static const NSInteger SECONDS_IN_MONTH_29 = 2505600;
static const NSInteger SECONDS_IN_MONTH_30 = 2592000;
static const NSInteger SECONDS_IN_MONTH_31 = 2678400;
static const NSInteger SECONDS_IN_WEEK = 604800;
static const NSInteger SECONDS_IN_DAY = 86400;
static const NSInteger SECONDS_IN_HOUR = 3600;
static const NSInteger SECONDS_IN_MINUTE = 60;
static const NSInteger MILLISECONDS_IN_DAY = 86400000;
FOUNDATION_EXPORT const long long SECONDS_IN_YEAR;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_MONTH_28;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_MONTH_29;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_MONTH_30;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_MONTH_31;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_WEEK;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_DAY;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_HOUR;
FOUNDATION_EXPORT const NSInteger SECONDS_IN_MINUTE;
FOUNDATION_EXPORT const NSInteger MILLISECONDS_IN_DAY;
#import "DTError.h"
33 changes: 33 additions & 0 deletions DateTools/DTConstants.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright (C) 2014 by Matthew York
//
// Permission is hereby granted, free of charge, to any
// person obtaining a copy of this software and
// associated documentation files (the "Software"), to
// deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the
// Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall
// be included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#import "DTConstants.h"
const long long SECONDS_IN_YEAR = 31556900;
const NSInteger SECONDS_IN_MONTH_28 = 2419200;
const NSInteger SECONDS_IN_MONTH_29 = 2505600;
const NSInteger SECONDS_IN_MONTH_30 = 2592000;
const NSInteger SECONDS_IN_MONTH_31 = 2678400;
const NSInteger SECONDS_IN_WEEK = 604800;
const NSInteger SECONDS_IN_DAY = 86400;
const NSInteger SECONDS_IN_HOUR = 3600;
const NSInteger SECONDS_IN_MINUTE = 60;
const NSInteger MILLISECONDS_IN_DAY = 86400000;
89 changes: 89 additions & 0 deletions DateTools/DateTools.bundle/gu.lproj/DateTools.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/* No comment provided by engineer. */
"%d days ago" = "%d દિવસ પહેલા";

/* No comment provided by engineer. */
"%d hours ago" = "%d કલાક પહેલા";

/* No comment provided by engineer. */
"%d minutes ago" = "%d મિનિટ પહેલા";

/* No comment provided by engineer. */
"%d months ago" = "%d મહિના પહેલા";

/* No comment provided by engineer. */
"%d seconds ago" = "%d સેકન્ડ પહેલા";

/* No comment provided by engineer. */
"%d weeks ago" = "%d અઠવાડિયા પહેલા";

/* No comment provided by engineer. */
"%d years ago" = "%d વર્ષ પહેલા";

/* No comment provided by engineer. */
"A minute ago" = "એક મિનિટ પહેલા";

/* No comment provided by engineer. */
"An hour ago" = "એક કલાક પહેલા";

/* No comment provided by engineer. */
"Just now" = "હમણાં";

/* No comment provided by engineer. */
"Last month" = "ગયા મહિને";

/* No comment provided by engineer. */
"Last week" = "ગયા અઠવાડિયે";

/* No comment provided by engineer. */
"Last year" = "ગયા વર્ષે";

/* No comment provided by engineer. */
"Yesterday" = "ગઈ કાલે";

/* No comment provided by engineer. */
"1 year ago" = "1 વર્ષ પહેલાં";

/* No comment provided by engineer. */
"1 month ago" = "1 મહિનો પહેલા";

/* No comment provided by engineer. */
"1 week ago" = "1 અઠવાડિયું પહેલા";

/* No comment provided by engineer. */
"1 day ago" = "1 દિવસ પહેલાં";

/* No comment provided by engineer. */
"1 hour ago" = "1 કલાક પહેલા";

/* No comment provided by engineer. */
"1 minute ago" = "1 મિનિટ પહેલા";

/* No comment provided by engineer. */
"1 second ago" = "1 સેકન્ડ પહેલા";

/* No comment provided by engineer. */
"This morning" = "આ સવારે";

/* No comment provided by engineer. */
"This afternoon" = "આજે બપોરે";

/* No comment provided by engineer. */
"Today" = "આજે";

/* No comment provided by engineer. */
"This week" = "આ અઠવાડિયેું";

/* No comment provided by engineer. */
"This month" = "આ મહિને";

/* No comment provided by engineer. */
"This year" = "આ વર્ષે";

/* Short format for */
"%dy" = "%dy"; // year
"%dM" = "%dM"; // month
"%dw" = "%dw"; // week
"%dd" = "%dd"; // day
"%dh" = "%dh"; // hour
"%dm" = "%dm"; // minute
"%ds" = "%ds"; // second
89 changes: 89 additions & 0 deletions DateTools/DateTools.bundle/hi.lproj/DateTools.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/* No comment provided by engineer. */
"%d days ago" = "%d दिन पहले";

/* No comment provided by engineer. */
"%d hours ago" = "%d घंटे पहले";

/* No comment provided by engineer. */
"%d minutes ago" = "%d मिनट पहले";

/* No comment provided by engineer. */
"%d months ago" = "%d महीन पहले";

/* No comment provided by engineer. */
"%d seconds ago" = "%d सेकंड पहले";

/* No comment provided by engineer. */
"%d weeks ago" = "%d हफ्ते पहले";

/* No comment provided by engineer. */
"%d years ago" = "%d साल पहले";

/* No comment provided by engineer. */
"A minute ago" = "एक मिनट पहले";

/* No comment provided by engineer. */
"An hour ago" = "एक घंटे पहले";

/* No comment provided by engineer. */
"Just now" = "बस अभी";

/* No comment provided by engineer. */
"Last month" = "पिछले महीने";

/* No comment provided by engineer. */
"Last week" = "पिछले हफ्ते";

/* No comment provided by engineer. */
"Last year" = "पिछले साल";

/* No comment provided by engineer. */
"Yesterday" = "कल";

/* No comment provided by engineer. */
"1 year ago" = "1 साल पहले";

/* No comment provided by engineer. */
"1 month ago" = "1 महीने पहले";

/* No comment provided by engineer. */
"1 week ago" = "1 हफ्ते पहले";

/* No comment provided by engineer. */
"1 day ago" = "1 दिन पहले";

/* No comment provided by engineer. */
"1 hour ago" = "1 घंटे पहले";

/* No comment provided by engineer. */
"1 minute ago" = "1 मिनट पहले";

/* No comment provided by engineer. */
"1 second ago" = "1 सेकंड पहले";

/* No comment provided by engineer. */
"This morning" = "आज सुबह";

/* No comment provided by engineer. */
"This afternoon" = "यह दोपहर";

/* No comment provided by engineer. */
"Today" = "आज";

/* No comment provided by engineer. */
"This week" = "इस सप्ताह";

/* No comment provided by engineer. */
"This month" = "इस महीने";

/* No comment provided by engineer. */
"This year" = "इस साल";

/* Short format for */
"%dy" = "%dy"; // year
"%dM" = "%dM"; // month
"%dw" = "%dw"; // week
"%dd" = "%dd"; // day
"%dh" = "%dh"; // hour
"%dm" = "%dm"; // minute
"%ds" = "%ds"; // second
89 changes: 89 additions & 0 deletions DateTools/DateTools.bundle/ms.lproj/DateTools.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/* No comment provided by engineer. */
"%d days ago" = "%d hari yang lepas";

/* No comment provided by engineer. */
"%d hours ago" = "%d jam yang lepas";

/* No comment provided by engineer. */
"%d minutes ago" = "%d minit yang lepas";

/* No comment provided by engineer. */
"%d months ago" = "%d bulan yang lepas";

/* No comment provided by engineer. */
"%d seconds ago" = "%d saat yang lepas";

/* No comment provided by engineer. */
"%d weeks ago" = "%d minggu yang lepas";

/* No comment provided by engineer. */
"%d years ago" = "%d tahun yang lepas";

/* No comment provided by engineer. */
"A minute ago" = "Seminit yang lepas";

/* No comment provided by engineer. */
"An hour ago" = "Sejam yang lepas";

/* No comment provided by engineer. */
"Just now" = "Sebentar tadi";

/* No comment provided by engineer. */
"Last month" = "Bulan lepas";

/* No comment provided by engineer. */
"Last week" = "Minggu lepas";

/* No comment provided by engineer. */
"Last year" = "Tahun lepas";

/* No comment provided by engineer. */
"Yesterday" = "Semalam";

/* No comment provided by engineer. */
"1 year ago" = "1 tahun lepas";

/* No comment provided by engineer. */
"1 month ago" = "1 bulan lepas";

/* No comment provided by engineer. */
"1 week ago" = "1 minggu lepas";

/* No comment provided by engineer. */
"1 day ago" = "1 hari lepas";

/* No comment provided by engineer. */
"1 hour ago" = "1 jam lepas";

/* No comment provided by engineer. */
"1 minute ago" = "1 minit lepas";

/* No comment provided by engineer. */
"1 second ago" = "1 saat lepas";

/* No comment provided by engineer. */
"This morning" = "Pagi ini";

/* No comment provided by engineer. */
"This afternoon" = "Petang ini";

/* No comment provided by engineer. */
"Today" = "Hari ini";

/* No comment provided by engineer. */
"This week" = "Minggu ini";

/* No comment provided by engineer. */
"This month" = "Bulan ini";

/* No comment provided by engineer. */
"This year" = "Tahun ini";

/* Short format for */
"%dy" = "%dy"; // year
"%dM" = "%dM"; // month
"%dw" = "%dw"; // week
"%dd" = "%dd"; // day
"%dh" = "%dh"; // hour
"%dm" = "%dm"; // minute
"%ds" = "%ds"; // second
Loading

0 comments on commit 8191f1e

Please sign in to comment.